diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp
index 9227cf8b8f..f8ef4e2807 100644
--- a/Common/KeyMap.cpp
+++ b/Common/KeyMap.cpp
@@ -51,7 +51,7 @@ struct DefaultKeyMap {
 		m[KeyDef(DEVICE_ID_KEYBOARD, KEYCODE_L)] = VIRTKEY_AXIS_X_MAX;
 		m[KeyDef(DEVICE_ID_KEYBOARD, KEYCODE_SHIFT_LEFT)] = VIRTKEY_RAPID_FIRE;
 		m[KeyDef(DEVICE_ID_KEYBOARD, KEYCODE_TAB)] = VIRTKEY_UNTHROTTLE;
-		m[KeyDef(DEVICE_ID_KEYBOARD, KEYCODE_F1)] = VIRTKEY_SPEED_TOGGLE;
+		m[KeyDef(DEVICE_ID_KEYBOARD, KEYCODE_GRAVE)] = VIRTKEY_SPEED_TOGGLE;
 		m[KeyDef(DEVICE_ID_KEYBOARD, KEYCODE_ESCAPE)] = VIRTKEY_PAUSE;
 		return m;
 	}
diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
index 6ff9da83ed..b4ae0a8fc7 100644
--- a/Windows/WndMainWindow.cpp
+++ b/Windows/WndMainWindow.cpp
@@ -1074,6 +1074,14 @@ namespace MainWindow
 
 		UINT ingameEnable = globalUIState == UISTATE_INGAME ? MF_ENABLED : MF_GRAYED;
 		EnableMenuItem(menu,ID_TOGGLE_PAUSE, ingameEnable);
+		if (globalUIState == UISTATE_INGAME)
+		{
+			if (Core_IsStepping())
+				ModifyMenu(menu, ID_TOGGLE_PAUSE, MF_BYCOMMAND | MF_STRING, ID_TOGGLE_PAUSE, "Run\tF8");
+			else
+				ModifyMenu(menu, ID_TOGGLE_PAUSE, MF_BYCOMMAND | MF_STRING, ID_TOGGLE_PAUSE, "Pause\tF8");
+		}
+
 		EnableMenuItem(menu,ID_EMULATION_STOP, ingameEnable);
 		EnableMenuItem(menu,ID_EMULATION_RESET, ingameEnable);
 
diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc
index 201519bee5..46064d2bad 100644
Binary files a/Windows/ppsspp.rc and b/Windows/ppsspp.rc differ