diff --git a/source-code/data/plugins/keyconfig.ini b/source-code/data/plugins/keyconfig.ini
index bcbeaea..066835d 100644
--- a/source-code/data/plugins/keyconfig.ini
+++ b/source-code/data/plugins/keyconfig.ini
@@ -37,8 +37,8 @@ JVS_CIRCLE = D, L, Ds4_Circle, Ds4_DPad_Right, Ds4_L_Trigger, Ds4_R_Trigger, XIN
 JVS_LEFT = Left, Up, Ds4_L1, Ds4_L_Stick_Up, Ds4_R_Stick_Up, XINPUT_LS
 JVS_RIGHT = Right, Down, Ds4_R1, Ds4_L_Stick_Down, Ds4_R_Stick_Down, XINPUT_RS
 
-MENU_L = Left, Up, Ds4_L1, Ds4_L_Stick_Up, Ds4_R_Stick_Up, XINPUT_LS, Ds4_DPad_Left, Ds4_DPad_Up, XINPUT_LEFT, XINPUT_UP, Q, U, Ds4_L_Stick_Left, XINPUT_LLEFT, Ds4_L_Stick_Up, XINPUT_LUP, Ds4_R_Stick_Left, XINPUT_RLEFT, Ds4_R_Stick_Up, XINPUT_RUP
-MENU_R = Right, Down, Ds4_R1, Ds4_L_Stick_Down, Ds4_R_Stick_Down, XINPUT_RS, Ds4_DPad_Right, Ds4_DPad_Down, XINPUT_RIGHT, XINPUT_DOWN, E, O, Ds4_L_Stick_Right, XINPUT_LRIGHT, Ds4_L_Stick_Down, XINPUT_LDOWN, Ds4_R_Stick_Right, XINPUT_RRIGHT, Ds4_R_Stick_Down, XINPUT_RDOWN
+MENU_L = Left, Up, Ds4_L1, XINPUT_LS, Ds4_DPad_Left, Ds4_DPad_Up, XINPUT_LEFT, XINPUT_UP, Q, U, Ds4_L_Stick_Left, XINPUT_LLEFT, Ds4_L_Stick_Up, XINPUT_LUP, Ds4_R_Stick_Left, XINPUT_RLEFT, Ds4_R_Stick_Up, XINPUT_RUP
+MENU_R = Right, Down, Ds4_R1, XINPUT_RS, Ds4_DPad_Right, Ds4_DPad_Down, XINPUT_RIGHT, XINPUT_DOWN, E, O, Ds4_L_Stick_Right, XINPUT_LRIGHT, Ds4_L_Stick_Down, XINPUT_LDOWN, Ds4_R_Stick_Right, XINPUT_RRIGHT, Ds4_R_Stick_Down, XINPUT_RDOWN
 MENU_CIRCLE = Spacebar
 
 # Touch Slider:
diff --git a/source-code/source/plugins/TLAC/Input/Xinput/Xinput.cpp b/source-code/source/plugins/TLAC/Input/Xinput/Xinput.cpp
index 9881a21..152d9ac 100644
--- a/source-code/source/plugins/TLAC/Input/Xinput/Xinput.cpp
+++ b/source-code/source/plugins/TLAC/Input/Xinput/Xinput.cpp
@@ -211,6 +211,18 @@ namespace TLAC::Input
 					if (state.Gamepad.sThumbLX < -10000)
 						currentState.KeyStates[i] = true;
 					SetTapStates(i, elapsed);
+
+					i = XINPUT_LUP;
+					currentState.KeyStates[i] = false;
+					if (state.Gamepad.sThumbLY > 10000)
+						currentState.KeyStates[i] = true;
+					SetTapStates(i, elapsed);
+
+					i = XINPUT_LDOWN;
+					currentState.KeyStates[i] = false;
+					if (state.Gamepad.sThumbLY < -10000)
+						currentState.KeyStates[i] = true;
+					SetTapStates(i, elapsed);
 				}
 
 				{
@@ -226,6 +238,18 @@ namespace TLAC::Input
 					if (state.Gamepad.sThumbRX < -10000)
 						currentState.KeyStates[i] = true;
 					SetTapStates(i, elapsed);
+
+					i = XINPUT_RUP;
+					currentState.KeyStates[i] = false;
+					if (state.Gamepad.sThumbRY > 10000)
+						currentState.KeyStates[i] = true;
+					SetTapStates(i, elapsed);
+
+					i = XINPUT_RDOWN;
+					currentState.KeyStates[i] = false;
+					if (state.Gamepad.sThumbRY < -10000)
+						currentState.KeyStates[i] = true;
+					SetTapStates(i, elapsed);
 				}
 
 				if (rumble && TLAC::Components::TouchSliderEmulator::LatestInstance->isSliderTouched() && TLAC::Components::TargetInspector::ShouldVibrate)