1 files changed, 8 insertions, 3 deletions
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index 6ac0dd3fe..65829662d 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -164,10 +164,15 @@ CharSelectDialog::CharSelectDialog(LoginData *const data):
         mCharacterView = new CharacterViewNormal(
             this, &mCharacterEntries, mPadding);
         placer(0, 1, mCharacterView, 10);
+        int sz = 410 + 2 * mPadding;
         if (config.getIntValue("fontSize") > 18)
-            reflowLayout(500 + 2 * mPadding);
-        else
-            reflowLayout(410 + 2 * mPadding);
+            sz = 500 + 2 * mPadding;
+        const int width = mCharacterView->getWidth() + 2 * mPadding;
+        if (sz < width)
+            sz = width;
+        if (sz > mainGraphics->getWidth())
+            sz = mainGraphics->getWidth();
+        reflowLayout(sz);
     }
     else
     {