diff --git a/src/emucore/FrameBuffer.cxx b/src/emucore/FrameBuffer.cxx
index 922ed9655..68b6e8caa 100644
--- a/src/emucore/FrameBuffer.cxx
+++ b/src/emucore/FrameBuffer.cxx
@@ -116,13 +116,20 @@ bool FrameBuffer::initialize()
   // The general font used in all UI elements
   // This is determined by the size of the framebuffer
   if(myOSystem.settings().getBool("minimal_ui"))
+  {
     myFont = make_unique<GUI::Font>(GUI::stella12x24tDesc);           // 12x24
+    // The info font used in all UI elements
+    // This is determined by the size of the framebuffer
+    myInfoFont = make_unique<GUI::Font>(GUI::stellaLargeDesc);        // 10x20
+  }
   else
+  {
     myFont = make_unique<GUI::Font>(GUI::stellaMediumDesc);           //  9x18
+    // The info font used in all UI elements
+    // This is determined by the size of the framebuffer
+    myInfoFont = make_unique<GUI::Font>(GUI::consoleDesc);            //  8x13
+  }
 
-  // The info font used in all UI elements
-  // This is determined by the size of the framebuffer
-  myInfoFont = make_unique<GUI::Font>(GUI::consoleDesc);              //  8x13
 
   // The font used by the ROM launcher
   const string& lf = myOSystem.settings().getString("launcherfont");
diff --git a/src/gui/StellaSettingsDialog.cxx b/src/gui/StellaSettingsDialog.cxx
index 951f28ad9..bc187b750 100644
--- a/src/gui/StellaSettingsDialog.cxx
+++ b/src/gui/StellaSettingsDialog.cxx
@@ -39,7 +39,8 @@ StellaSettingsDialog::StellaSettingsDialog(OSystem& osystem, DialogContainer& pa
   const int buttonHeight = _font.getLineHeight() + 6,
     lineHeight = _font.getLineHeight(),
     fontWidth = _font.getMaxCharWidth(),
-    buttonWidth = _font.getStringWidth("Help" + ELLIPSIS) + 32;
+    buttonWidth = _font.getStringWidth("Help" + ELLIPSIS) + 32,
+    iLineHeight = instance().frameBuffer().infoFont().getLineHeight();
   const int VGAP = 5;
   int xpos, ypos;
   ButtonWidget* bw = nullptr;
@@ -48,7 +49,8 @@ StellaSettingsDialog::StellaSettingsDialog(OSystem& osystem, DialogContainer& pa
   VariantList items;
 
   // Set real dimensions
-  setSize(35 * fontWidth + HBORDER * 2 + 3, 15 * (lineHeight + VGAP) + VGAP * 9 + 10 + _th, max_w, max_h);
+  setSize(35 * fontWidth + HBORDER * 2 + 3, 10 * (lineHeight + VGAP) + 3 * (iLineHeight + VGAP)
+          + VGAP * (12 + 2) + buttonHeight * 2 + _th, max_w, max_h);
 
   xpos = HBORDER;
   ypos = VBORDER + _th;