diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index 30c2acc714..e38389b133 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -232,7 +232,7 @@ void GameSettingsScreen::CreateViews() {
 
 	graphicsSettings->Add(new ItemHeader(gs->T("Frame Rate Control")));
 	static const char *frameSkip[] = {"Off", "Auto", "1", "2", "3", "4", "5", "6", "7", "8"};
-	graphicsSettings->Add(new PopupMultiChoice(&g_Config.iFrameSkip, gs->T("Frame Skipping"), frameSkip, 0, 9, gs, screenManager()));
+	graphicsSettings->Add(new PopupMultiChoice(&g_Config.iFrameSkip, gs->T("Frame Skipping"), frameSkip, 0, 10, gs, screenManager()));
 	static const char *fpsChoices[] = {"None", "Speed", "FPS", "Both"};
 
 	graphicsSettings->Add(new CheckBox(&cap60FPS_, gs->T("Force max 60 FPS (helps GoW)")));
diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
index 0548a00504..0986260192 100644
--- a/Windows/WndMainWindow.cpp
+++ b/Windows/WndMainWindow.cpp
@@ -286,20 +286,24 @@ namespace MainWindow
 
 		char message[256];
 		memset(message, 0, sizeof(message));
+		const char *frameskipStr = g->T("Frameskipping");
+		const char *offStr = g->T("Off");
+		const char *autoStr = g->T("Auto");
+		const char *framesStr = g->T("Frames");
 
 		switch(g_Config.iFrameSkip) {
 		case 0:
-			sprintf(message, "Frameskipping: Off");
+			sprintf(message, "%s: %s", frameskipStr, offStr);
 			break;
-		case 1:
-			sprintf(message, "Frameskipping: Auto");
+		case 1:	
+			sprintf(message, "%s: %s", frameskipStr, autoStr);
 			break;
 		default:
-			sprintf(message, "Frameskipping: %d frames", g_Config.iFrameSkip);
+			sprintf(message, "%s: %d %s", frameskipStr, g_Config.iFrameSkip, framesStr);
 			break;
 		}
-
-		osm.Show(g->T(message)); 
+		
+		osm.Show(message); 
 	}
 
 	void enableCheats(bool cheats) {
@@ -877,8 +881,8 @@ namespace MainWindow
 					setFrameSkipping(FRAMESKIP_OFF);
 					break;
 
-				case ID_OPTIONS_FRAMESKIP_1:
-					setFrameSkipping(FRAMESKIP_1);
+				case ID_OPTIONS_FRAMESKIP_AUTO:
+					setFrameSkipping(FRAMESKIP_AUTO);
 					break;
 
 				case ID_OPTIONS_FRAMESKIP_2: