diff --git a/src/emucore/OSystem.hxx b/src/emucore/OSystem.hxx
index 0bedddb4c..8dd18e909 100644
--- a/src/emucore/OSystem.hxx
+++ b/src/emucore/OSystem.hxx
@@ -69,11 +69,6 @@ class AudioSettings;
 class OSystem
 {
   friend class EventHandler;
-#ifdef GUI_SUPPORT
-  friend class VideoDialog;
-  friend class StellaSettingsDialog;
-  friend class DeveloperDialog;
-#endif
 
   public:
     OSystem();
@@ -84,6 +79,14 @@ class OSystem
     */
     virtual bool create();
 
+    /**
+      Creates the various framebuffers/renderers available in this system.
+      Note that it will only create one type per run of Stella.
+
+      @return  Success or failure of the framebuffer creation
+    */
+    FBInitStatus createFrameBuffer();
+
   public:
     /**
       Get the event handler of the system.
@@ -558,14 +561,6 @@ class OSystem
   #endif
 
   private:
-    /**
-      Creates the various framebuffers/renderers available in this system.
-      Note that it will only create one type per run of Stella.
-
-      @return  Success or failure of the framebuffer creation
-    */
-    FBInitStatus createFrameBuffer();
-
     /**
       Creates the various sound devices available in this system
     */
diff --git a/src/gui/MinUICommandDialog.cxx b/src/gui/MinUICommandDialog.cxx
index 704e7190b..ec48cfce1 100644
--- a/src/gui/MinUICommandDialog.cxx
+++ b/src/gui/MinUICommandDialog.cxx
@@ -222,6 +222,7 @@ void MinUICommandDialog::handleCommand(CommandSender* sender, int cmd,
     case kStretchCmd:
       instance().eventHandler().leaveMenuMode();
       instance().settings().setValue("tia.fs_stretch", !instance().settings().getBool("tia.fs_stretch"));
+      instance().createFrameBuffer();
       break;
 
     case kPhosphorCmd: