diff --git a/src/StatusWindow.cc b/src/StatusWindow.cc
index 329684e7..5d126a91 100644
--- a/src/StatusWindow.cc
+++ b/src/StatusWindow.cc
@@ -72,7 +72,9 @@ StatusWindow::draw(const std::string &text, bool do_center, Geometry *gm)
 	Theme::TextDialogData *sd = _theme->getStatusData();
 	PFont *font = sd->getFont();
 
-	width = font->getWidth(text) + 10;
+	width = font->getWidth(text)
+		+ sd->getPad(PAD_LEFT)
+		+ sd->getPad(PAD_RIGHT);
 	width = width - (width % 10);
 	height = font->getHeight()
 		+ sd->getPad(PAD_UP)