diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp
index f59e02752..6aab8b977 100644
--- a/src/gui/videosettings.cpp
+++ b/src/gui/videosettings.cpp
@@ -300,9 +300,9 @@ void CVideoSettings::setupVideoSystem(bool do_ask)
 				g_settings.video_Mode = prev_video_mode;
 				videoDecoder->SetVideoSystem(g_settings.video_Mode);
 			}
+			else
+				prev_video_mode = g_settings.video_Mode;
 		}
-		else
-			prev_video_mode = g_settings.video_Mode;
 	}
 }
 
@@ -343,6 +343,7 @@ bool CVideoSettings::changeNotify(const neutrino_locale_t OptionName, void * /*
 	else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_VIDEOMODE))
 	{
 		setupVideoSystem(true/*ask*/);
+		return true;
 	}
 #if 0
         else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_CONTRAST))