diff --git a/input.cpp b/input.cpp
index 06dad86..7e8c34e 100644
--- a/input.cpp
+++ b/input.cpp
@@ -2220,6 +2220,21 @@ int input_test(int getchar)
 								}
 							}
 
+							//Menu combo on 8BitDo receiver in PSC mode
+							if (input[i].vid == 0x054c && input[i].pid == 0x0cda && ev.type == EV_KEY)
+							{
+								//in PSC mode these keys coming from separate virtual keyboard device
+								//so it's impossible to use joystick codes as keyboards aren't personalized
+								if (ev.code == 164) ev.code = KEY_MENU;
+								if (ev.code == 1)   ev.code = KEY_MENU;
+							}
+
+							//Menu button quirk of 8BitDo gamepad in X-Input mode
+							if (input[i].vid == 0x045e && input[i].pid == 0x02e0 && ev.type == EV_KEY)
+							{
+								if (ev.code == KEY_MENU) ev.code = BTN_MODE;
+							}
+
 							if (is_menu_core())
 							{
 								/*
@@ -2287,13 +2302,6 @@ int input_test(int getchar)
 								}
 							}
 
-							//Menu combo on 8BitDo receiver in PSC mode
-							if (input[i].vid == 0x054c && input[i].pid == 0x0cda && ev.type == EV_KEY)
-							{
-								if (ev.code == 164) ev.code = KEY_MENU;
-								if (ev.code == 1)   ev.code = KEY_MENU;
-							}
-
 							input_cb(&ev, &absinfo, i);
 
 							//sumulate digital directions from analog