diff --git a/src/emucore/FrameBuffer.cxx b/src/emucore/FrameBuffer.cxx
index aa1aa1490..286cd2a6b 100644
--- a/src/emucore/FrameBuffer.cxx
+++ b/src/emucore/FrameBuffer.cxx
@@ -293,8 +293,6 @@ FBInitStatus FrameBuffer::createDisplay(const string& title,
       Logger::info(post_about);
   }
 
-  if (myTIASurface) myTIASurface->updateSurfaceSettings();
-
   return FBInitStatus::Success;
 }
 
diff --git a/src/gui/VideoDialog.cxx b/src/gui/VideoDialog.cxx
index 21cf9b00d..49dc33cc3 100644
--- a/src/gui/VideoDialog.cxx
+++ b/src/gui/VideoDialog.cxx
@@ -493,8 +493,11 @@ void VideoDialog::saveConfig()
   // TV scanline intensity
   instance().settings().setValue("tv.scanlines", myTVScanIntense->getValueLabel());
 
-  // Finally, issue a complete framebuffer re-initialization
+  // Finally, issue a complete framebuffer re-initialization...
   instance().createFrameBuffer();
+
+  // ... and apply potential setting changes to the TIA surface
+  instance().frameBuffer().tiaSurface().updateSurfaceSettings();
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -