diff --git a/Common/KeyMap.h b/Common/KeyMap.h
index 334b5a53f9..369b12fc89 100644
--- a/Common/KeyMap.h
+++ b/Common/KeyMap.h
@@ -29,28 +29,28 @@
 #define KEYMAP_ERROR_UNKNOWN_KEY 0
 
 enum {
-	VIRTKEY_FIRST = 0x10000,
-	VIRTKEY_AXIS_X_MIN = 0x10000,
-	VIRTKEY_AXIS_Y_MIN = 0x10001,
-	VIRTKEY_AXIS_X_MAX = 0x10002,
-	VIRTKEY_AXIS_Y_MAX = 0x10003,
-	VIRTKEY_RAPID_FIRE = 0x10004,
-	VIRTKEY_UNTHROTTLE = 0x10005,
-	VIRTKEY_PAUSE = 0x10006,
-	VIRTKEY_SPEED_TOGGLE = 0x10007,
-	VIRTKEY_AXIS_RIGHT_X_MIN = 0x10008,
-	VIRTKEY_AXIS_RIGHT_Y_MIN = 0x10009,
-	VIRTKEY_AXIS_RIGHT_X_MAX = 0x1000a,
-	VIRTKEY_AXIS_RIGHT_Y_MAX = 0x1000b,
-	VIRTKEY_REWIND = 0x1000c,
-	VIRTKEY_SAVE_STATE = 0x1000d,
-	VIRTKEY_LOAD_STATE = 0x1000e,
-	VIRTKEY_NEXT_SLOT  = 0x1000f,
-	VIRTKEY_TOGGLE_FULLSCREEN = 0x10010,
-	VIRTKEY_ANALOG_LIGHTLY = 0x10011,
-	VIRTKEY_AXIS_SWAP = 0x10012,
-	VIRTKEY_DEVMENU = 0x10013,
-	VIRTKEY_FRAME_ADVANCE = 0x10014,
+	VIRTKEY_FIRST = 0x40000001,
+	VIRTKEY_AXIS_X_MIN = 0x40000001,
+	VIRTKEY_AXIS_Y_MIN = 0x40000002,
+	VIRTKEY_AXIS_X_MAX = 0x40000003,
+	VIRTKEY_AXIS_Y_MAX = 0x40000004,
+	VIRTKEY_RAPID_FIRE = 0x40000005,
+	VIRTKEY_UNTHROTTLE = 0x40000006,
+	VIRTKEY_PAUSE = 0x40000007,
+	VIRTKEY_SPEED_TOGGLE = 0x40000008,
+	VIRTKEY_AXIS_RIGHT_X_MIN = 0x40000009,
+	VIRTKEY_AXIS_RIGHT_Y_MIN = 0x4000000a,
+	VIRTKEY_AXIS_RIGHT_X_MAX = 0x4000000b,
+	VIRTKEY_AXIS_RIGHT_Y_MAX = 0x4000000c,
+	VIRTKEY_REWIND = 0x4000000d,
+	VIRTKEY_SAVE_STATE = 0x4000000e,
+	VIRTKEY_LOAD_STATE = 0x4000000f,
+	VIRTKEY_NEXT_SLOT = 0x40000010,
+	VIRTKEY_TOGGLE_FULLSCREEN = 0x40000011,
+	VIRTKEY_ANALOG_LIGHTLY = 0x40000012,
+	VIRTKEY_AXIS_SWAP = 0x40000013,
+	VIRTKEY_DEVMENU = 0x40000014,
+	VIRTKEY_FRAME_ADVANCE = 0x40000015,
 	VIRTKEY_LAST,
 	VIRTKEY_COUNT = VIRTKEY_LAST - VIRTKEY_FIRST
 };
diff --git a/Core/HLE/sceCtrl.h b/Core/HLE/sceCtrl.h
index 524240ebf6..12e5969643 100644
--- a/Core/HLE/sceCtrl.h
+++ b/Core/HLE/sceCtrl.h
@@ -58,7 +58,7 @@ const int CTRL_STICK_RIGHT = 1;
 #define CTRL_MASK_DPAD    (CTRL_UP | CTRL_DOWN | CTRL_LEFT | CTRL_RIGHT)
 #define CTRL_MASK_ACTION  (CTRL_SQUARE | CTRL_TRIANGLE | CTRL_CIRCLE | CTRL_CROSS)
 #define CTRL_MASK_TRIGGER (CTRL_LTRIGGER | CTRL_RTRIGGER)
-#define CTRL_MASK_USER    (CTRL_MASK_DPAD | CTRL_MASK_ACTION | CTRL_START | CTRL_SELECT | CTRL_MASK_TRIGGER | CTRL_HOME | CTRL_HOLD)
+#define CTRL_MASK_USER    (CTRL_MASK_DPAD | CTRL_MASK_ACTION | CTRL_START | CTRL_SELECT | CTRL_MASK_TRIGGER | CTRL_HOME | CTRL_HOLD | CTRL_WLAN | CTRL_REMOTE_HOLD | CTRL_VOL_UP | CTRL_VOL_DOWN | CTRL_SCREEN | CTRL_NOTE)
 
 void __CtrlInit();
 void __CtrlDoState(PointerWrap &p);