diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp
index 02a0314b21..9cc32daf1c 100644
--- a/Common/KeyMap.cpp
+++ b/Common/KeyMap.cpp
@@ -66,11 +66,14 @@ static const DefMappingStruct defaultQwertyKeyboardKeyMap[] = {
 	{VIRTKEY_AXIS_Y_MIN, NKCODE_K},
 	{VIRTKEY_AXIS_X_MIN, NKCODE_J},
 	{VIRTKEY_AXIS_X_MAX, NKCODE_L},
-	{VIRTKEY_RAPID_FIRE  , NKCODE_SHIFT_LEFT},
-	{VIRTKEY_UNTHROTTLE  , NKCODE_TAB},
+	{VIRTKEY_RAPID_FIRE, NKCODE_SHIFT_LEFT},
+	{VIRTKEY_UNTHROTTLE, NKCODE_TAB},
 	{VIRTKEY_SPEED_TOGGLE, NKCODE_GRAVE},
-	{VIRTKEY_PAUSE       , NKCODE_ESCAPE},
-	{VIRTKEY_REWIND      , NKCODE_DEL},
+	{VIRTKEY_PAUSE, NKCODE_ESCAPE},
+	{VIRTKEY_REWIND, NKCODE_DEL},
+	{VIRTKEY_SAVE_STATE, NKCODE_F2},
+	{VIRTKEY_LOAD_STATE, NKCODE_F4},
+	{VIRTKEY_NEXT_SLOT, NKCODE_F3},
 };
 
 static const DefMappingStruct defaultAzertyKeyboardKeyMap[] = {
@@ -95,11 +98,14 @@ static const DefMappingStruct defaultAzertyKeyboardKeyMap[] = {
 	{VIRTKEY_AXIS_Y_MIN, NKCODE_K},
 	{VIRTKEY_AXIS_X_MIN, NKCODE_J},
 	{VIRTKEY_AXIS_X_MAX, NKCODE_L},
-	{VIRTKEY_RAPID_FIRE  , NKCODE_SHIFT_LEFT},
-	{VIRTKEY_UNTHROTTLE  , NKCODE_TAB},
+	{VIRTKEY_RAPID_FIRE, NKCODE_SHIFT_LEFT},
+	{VIRTKEY_UNTHROTTLE, NKCODE_TAB},
 	{VIRTKEY_SPEED_TOGGLE, NKCODE_GRAVE},
-	{VIRTKEY_PAUSE       , NKCODE_ESCAPE},
-	{VIRTKEY_REWIND      , NKCODE_DEL},
+	{VIRTKEY_PAUSE, NKCODE_ESCAPE},
+	{VIRTKEY_REWIND, NKCODE_DEL},
+	{VIRTKEY_SAVE_STATE, NKCODE_F2},
+	{VIRTKEY_LOAD_STATE, NKCODE_F4},
+	{VIRTKEY_NEXT_SLOT, NKCODE_F3},
 };
 
 static const DefMappingStruct defaultQwertzKeyboardKeyMap[] = {
@@ -124,11 +130,14 @@ static const DefMappingStruct defaultQwertzKeyboardKeyMap[] = {
 	{VIRTKEY_AXIS_Y_MIN, NKCODE_K},
 	{VIRTKEY_AXIS_X_MIN, NKCODE_J},
 	{VIRTKEY_AXIS_X_MAX, NKCODE_L},
-	{VIRTKEY_RAPID_FIRE  , NKCODE_SHIFT_LEFT},
-	{VIRTKEY_UNTHROTTLE  , NKCODE_TAB},
+	{VIRTKEY_RAPID_FIRE, NKCODE_SHIFT_LEFT},
+	{VIRTKEY_UNTHROTTLE, NKCODE_TAB},
 	{VIRTKEY_SPEED_TOGGLE, NKCODE_GRAVE},
-	{VIRTKEY_PAUSE       , NKCODE_ESCAPE},
-	{VIRTKEY_REWIND      , NKCODE_DEL},
+	{VIRTKEY_PAUSE, NKCODE_ESCAPE},
+	{VIRTKEY_REWIND, NKCODE_DEL},
+	{VIRTKEY_SAVE_STATE, NKCODE_F2},
+	{VIRTKEY_LOAD_STATE, NKCODE_F4},
+	{VIRTKEY_NEXT_SLOT, NKCODE_F3},
 };
 
 static const DefMappingStruct default360KeyMap[] = {
diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
index b478499578..23ceb8c8bf 100644
--- a/Windows/WndMainWindow.cpp
+++ b/Windows/WndMainWindow.cpp
@@ -19,6 +19,7 @@
 // It's improving slowly, though. :)
 
 #include "Common/CommonWindows.h"
+#include "Common/KeyMap.h"
 
 #include <map>
 #include <string>
@@ -574,7 +575,7 @@ namespace MainWindow {
 		TranslateMenuItem(ID_FILE_LOAD_DIR);
 		TranslateMenuItem(ID_FILE_LOAD_MEMSTICK);
 		TranslateMenuItem(ID_FILE_MEMSTICK);
-		TranslateSubMenu("Savestate Slot", MENU_FILE, SUBMENU_FILE_SAVESTATE_SLOT, L"\tF3");
+		TranslateSubMenu("Savestate Slot", MENU_FILE, SUBMENU_FILE_SAVESTATE_SLOT, L"\tF2");
 		TranslateMenuItem(ID_FILE_QUICKLOADSTATE, L"\tF4");
 		TranslateMenuItem(ID_FILE_QUICKSAVESTATE, L"\tF2");
 		TranslateMenuItem(ID_FILE_LOADSTATEFILE);
diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc
index 868649f9c5..6c01a077eb 100644
--- a/Windows/ppsspp.rc
+++ b/Windows/ppsspp.rc
@@ -73,9 +73,9 @@ BEGIN
     "L",            ID_DEBUG_LOG,           VIRTKEY, CONTROL, NOINVERT
     "M",            ID_DEBUG_MEMORYVIEW,    VIRTKEY, CONTROL, NOINVERT
     "R",            ID_DEBUG_REGISTERS,     VIRTKEY, CONTROL, NOINVERT
-    VK_F3,          ID_FILE_SAVESTATE_NEXT_SLOT, VIRTKEY, NOINVERT
-    VK_F2,          ID_FILE_QUICKSAVESTATE, VIRTKEY, NOINVERT
-    VK_F4,          ID_FILE_QUICKLOADSTATE, VIRTKEY, NOINVERT
+    //VK_F3,          ID_FILE_SAVESTATE_NEXT_SLOT, VIRTKEY, NOINVERT
+    //VK_F2,          ID_FILE_QUICKSAVESTATE, VIRTKEY, NOINVERT
+    //VK_F4,          ID_FILE_QUICKLOADSTATE, VIRTKEY, NOINVERT
     "1",            ID_OPTIONS_RESOLUTIONDUMMY,    VIRTKEY, CONTROL, NOINVERT
     VK_F5,          ID_OPTIONS_BUFFEREDRENDERINGDUMMY, VIRTKEY, NOINVERT
     VK_F7,          ID_OPTIONS_FRAMESKIPDUMMY, VIRTKEY, NOINVERT