diff --git a/docs/index.html b/docs/index.html
index 93779088a..2f750bde9 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -2371,7 +2371,7 @@
     </tr>
 
     <tr>
-      <td><pre>-launcherfont &lt;small|small medium|medium|large&gt;</pre></td>
+      <td><pre>-launcherfont &lt;small|small_medium|medium|large&gt;</pre></td>
       <td>Set the size of the font in the ROM launcher.</td>
     </tr>
 
diff --git a/src/emucore/FrameBuffer.cxx b/src/emucore/FrameBuffer.cxx
index c3789f0ed..d75179f86 100644
--- a/src/emucore/FrameBuffer.cxx
+++ b/src/emucore/FrameBuffer.cxx
@@ -125,7 +125,7 @@ bool FrameBuffer::initialize()
   const string& lf = myOSystem.settings().getString("launcherfont");
   if(lf == "small")
     myLauncherFont = make_unique<GUI::Font>(GUI::consoleBDesc); // 8x13
-  else if(lf == "small medium")
+  else if(lf == "small_medium")
     myLauncherFont = make_unique<GUI::Font>(GUI::consoleMediumBDesc); // 9x15
   else if(lf == "medium")
     myLauncherFont = make_unique<GUI::Font>(GUI::stellaMediumDesc); // 9x18
diff --git a/src/emucore/Settings.cxx b/src/emucore/Settings.cxx
index 00bb983fd..7588ccfdc 100644
--- a/src/emucore/Settings.cxx
+++ b/src/emucore/Settings.cxx
@@ -342,7 +342,7 @@ void Settings::validate()
     setValue("palette", "standard");
 
   s = getString("launcherfont");
-  if(s != "small" && s != "small medium" && s != "medium" && s != "large")
+  if(s != "small" && s != "small_medium" && s != "medium" && s != "large")
     setValue("launcherfont", "medium");
 
   s = getString("dbg.fontsize");
@@ -478,7 +478,7 @@ void Settings::usage() const
     << "  -exitlauncher <1|0>          On exiting a ROM, go back to the ROM launcher\n"
     << "  -launcherres  <WxH>          The resolution to use in ROM launcher mode\n"
     << "  -launcherfont <small|medium| Use the specified font in the ROM launcher\n"
-    << "                 small medium|large>\n"
+    << "                 small_medium|large>\n"
     << "  -launcherroms <1|0>          Show only ROMs in the launcher (vs. all files)\n"
     << "  -romviewer    <float>        Show ROM info viewer at given zoom level in ROM\n"
     << "                                launcher (use 0 for off)\n"
diff --git a/src/gui/UIDialog.cxx b/src/gui/UIDialog.cxx
index 1b2cb58e6..287659912 100644
--- a/src/gui/UIDialog.cxx
+++ b/src/gui/UIDialog.cxx
@@ -217,7 +217,7 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent,
   pwidth = font.getStringWidth("2x (1000x760)");
   items.clear();
   VarList::push_back(items, "Small", "small");
-  VarList::push_back(items, "Small Medium", "small medium");
+  VarList::push_back(items, "Small Medium", "small_medium");
   VarList::push_back(items, "Medium", "medium");
   VarList::push_back(items, "Large", "large");
   myLauncherFontPopup =