diff --git a/src/Ryujinx.Ava/UI/Models/Input/ControllerInputConfig.cs b/src/Ryujinx.Ava/UI/Models/Input/ControllerInputConfig.cs
index fc7a5fd11..0826f9212 100644
--- a/src/Ryujinx.Ava/UI/Models/Input/ControllerInputConfig.cs
+++ b/src/Ryujinx.Ava/UI/Models/Input/ControllerInputConfig.cs
@@ -63,13 +63,13 @@ namespace Ryujinx.Ava.UI.Models.Input
             }
         }
 
-        private GamepadInputId _leftControllerStickButton;
-        public GamepadInputId LeftControllerStickButton
+        private GamepadInputId _leftStickButton;
+        public GamepadInputId LeftStickButton
         {
-            get => _leftControllerStickButton;
+            get => _leftStickButton;
             set
             {
-                _leftControllerStickButton = value;
+                _leftStickButton = value;
                 OnPropertyChanged();
             }
         }
@@ -118,13 +118,13 @@ namespace Ryujinx.Ava.UI.Models.Input
             }
         }
 
-        private GamepadInputId _rightControllerStickButton;
-        public GamepadInputId RightControllerStickButton
+        private GamepadInputId _rightStickButton;
+        public GamepadInputId RightStickButton
         {
-            get => _rightControllerStickButton;
+            get => _rightStickButton;
             set
             {
-                _rightControllerStickButton = value;
+                _rightStickButton = value;
                 OnPropertyChanged();
             }
         }
@@ -479,17 +479,17 @@ namespace Ryujinx.Ava.UI.Models.Input
                     return;
                 }
 
-                LeftJoystick               = controllerInput.LeftJoyconStick.Joystick;
-                LeftInvertStickX           = controllerInput.LeftJoyconStick.InvertStickX;
-                LeftInvertStickY           = controllerInput.LeftJoyconStick.InvertStickY;
-                LeftRotate90               = controllerInput.LeftJoyconStick.Rotate90CW;
-                LeftControllerStickButton  = controllerInput.LeftJoyconStick.StickButton;
+                LeftJoystick      = controllerInput.LeftJoyconStick.Joystick;
+                LeftInvertStickX  = controllerInput.LeftJoyconStick.InvertStickX;
+                LeftInvertStickY  = controllerInput.LeftJoyconStick.InvertStickY;
+                LeftRotate90      = controllerInput.LeftJoyconStick.Rotate90CW;
+                LeftStickButton   = controllerInput.LeftJoyconStick.StickButton;
 
-                RightJoystick              = controllerInput.RightJoyconStick.Joystick;
-                RightInvertStickX          = controllerInput.RightJoyconStick.InvertStickX;
-                RightInvertStickY          = controllerInput.RightJoyconStick.InvertStickY;
-                RightRotate90              = controllerInput.RightJoyconStick.Rotate90CW;
-                RightControllerStickButton = controllerInput.RightJoyconStick.StickButton;
+                RightJoystick     = controllerInput.RightJoyconStick.Joystick;
+                RightInvertStickX = controllerInput.RightJoyconStick.InvertStickX;
+                RightInvertStickY = controllerInput.RightJoyconStick.InvertStickY;
+                RightRotate90     = controllerInput.RightJoyconStick.Rotate90CW;
+                RightStickButton  = controllerInput.RightJoyconStick.StickButton;
 
                 DpadUp        = controllerInput.LeftJoycon.DpadUp;
                 DpadDown      = controllerInput.LeftJoycon.DpadDown;
@@ -582,7 +582,7 @@ namespace Ryujinx.Ava.UI.Models.Input
                     InvertStickX = LeftInvertStickX,
                     InvertStickY = LeftInvertStickY,
                     Rotate90CW = LeftRotate90,
-                    StickButton = LeftControllerStickButton,
+                    StickButton = LeftStickButton,
                 },
                 RightJoyconStick = new JoyconConfigControllerStick<GamepadInputId, StickInputId>
                 {
@@ -590,7 +590,7 @@ namespace Ryujinx.Ava.UI.Models.Input
                     InvertStickX = RightInvertStickX,
                     InvertStickY = RightInvertStickY,
                     Rotate90CW = RightRotate90,
-                    StickButton = RightControllerStickButton,
+                    StickButton = RightStickButton,
                 },
                 Rumble = new RumbleConfigController
                 {
diff --git a/src/Ryujinx.Ava/UI/Models/Input/KeyboardInputConfig.cs b/src/Ryujinx.Ava/UI/Models/Input/KeyboardInputConfig.cs
index f35413283..33ef38186 100644
--- a/src/Ryujinx.Ava/UI/Models/Input/KeyboardInputConfig.cs
+++ b/src/Ryujinx.Ava/UI/Models/Input/KeyboardInputConfig.cs
@@ -54,13 +54,13 @@ namespace Ryujinx.Ava.UI.Models.Input
             }
         }
 
-        private Key _leftKeyboardStickButton;
-        public Key LeftKeyboardStickButton
+        private Key _leftStickButton;
+        public Key LeftStickButton
         {
-            get => _leftKeyboardStickButton;
+            get => _leftStickButton;
             set
             {
-                _leftKeyboardStickButton = value;
+                _leftStickButton = value;
                 OnPropertyChanged();
             }
         }
@@ -109,13 +109,13 @@ namespace Ryujinx.Ava.UI.Models.Input
             }
         }
 
-        private Key _rightKeyboardStickButton;
-        public Key RightKeyboardStickButton
+        private Key _rightStickButton;
+        public Key RightStickButton
         {
-            get => _rightKeyboardStickButton;
+            get => _rightStickButton;
             set
             {
-                _rightKeyboardStickButton = value;
+                _rightStickButton = value;
                 OnPropertyChanged();
             }
         }
@@ -331,15 +331,17 @@ namespace Ryujinx.Ava.UI.Models.Input
                     return;
                 }
 
-                LeftStickUp     = keyboardConfig.LeftJoyconStick.StickUp;
-                LeftStickDown   = keyboardConfig.LeftJoyconStick.StickDown;
-                LeftStickLeft   = keyboardConfig.LeftJoyconStick.StickLeft;
-                LeftStickRight  = keyboardConfig.LeftJoyconStick.StickRight;
+                LeftStickUp      = keyboardConfig.LeftJoyconStick.StickUp;
+                LeftStickDown    = keyboardConfig.LeftJoyconStick.StickDown;
+                LeftStickLeft    = keyboardConfig.LeftJoyconStick.StickLeft;
+                LeftStickRight   = keyboardConfig.LeftJoyconStick.StickRight;
+                LeftStickButton  = keyboardConfig.LeftJoyconStick.StickButton;
 
-                RightStickUp    = keyboardConfig.RightJoyconStick.StickUp;
-                RightStickDown  = keyboardConfig.RightJoyconStick.StickDown;
-                RightStickLeft  = keyboardConfig.RightJoyconStick.StickLeft;
-                RightStickRight = keyboardConfig.RightJoyconStick.StickRight;
+                RightStickUp     = keyboardConfig.RightJoyconStick.StickUp;
+                RightStickDown   = keyboardConfig.RightJoyconStick.StickDown;
+                RightStickLeft   = keyboardConfig.RightJoyconStick.StickLeft;
+                RightStickRight  = keyboardConfig.RightJoyconStick.StickRight;
+                RightStickButton = keyboardConfig.RightJoyconStick.StickButton;
 
                 DpadUp        = keyboardConfig.LeftJoycon.DpadUp;
                 DpadDown      = keyboardConfig.LeftJoycon.DpadDown;
@@ -371,48 +373,45 @@ namespace Ryujinx.Ava.UI.Models.Input
                 Backend = InputBackendType.WindowKeyboard,
                 PlayerIndex = PlayerIndex,
                 ControllerType = ControllerType,
-                LeftJoycon =
-                    new LeftJoyconCommonConfig<Key>
-                    {
-                        DpadUp = DpadUp,
-                        DpadDown = DpadDown,
-                        DpadLeft = DpadLeft,
-                        DpadRight = DpadRight,
-                        ButtonL = ButtonL,
-                        ButtonMinus = ButtonMinus,
-                        ButtonZl = ButtonZl,
-                        ButtonSl = LeftButtonSl,
-                        ButtonSr = LeftButtonSr,
-                    },
-                RightJoycon =
-                    new RightJoyconCommonConfig<Key>
-                    {
-                        ButtonA = ButtonA,
-                        ButtonB = ButtonB,
-                        ButtonX = ButtonX,
-                        ButtonY = ButtonY,
-                        ButtonPlus = ButtonPlus,
-                        ButtonSl = RightButtonSl,
-                        ButtonSr = RightButtonSr,
-                        ButtonR = ButtonR,
-                        ButtonZr = ButtonZr
-                    },
-                LeftJoyconStick =
-                    new JoyconConfigKeyboardStick<Key>
-                    {
-                        StickUp = LeftStickUp,
-                        StickDown = LeftStickDown,
-                        StickRight = LeftStickRight,
-                        StickLeft = LeftStickLeft,
-                        StickButton = LeftKeyboardStickButton
-                    },
+                LeftJoycon = new LeftJoyconCommonConfig<Key>
+                {
+                    DpadUp = DpadUp,
+                    DpadDown = DpadDown,
+                    DpadLeft = DpadLeft,
+                    DpadRight = DpadRight,
+                    ButtonL = ButtonL,
+                    ButtonMinus = ButtonMinus,
+                    ButtonZl = ButtonZl,
+                    ButtonSl = LeftButtonSl,
+                    ButtonSr = LeftButtonSr,
+                },
+                RightJoycon = new RightJoyconCommonConfig<Key>
+                {
+                    ButtonA = ButtonA,
+                    ButtonB = ButtonB,
+                    ButtonX = ButtonX,
+                    ButtonY = ButtonY,
+                    ButtonPlus = ButtonPlus,
+                    ButtonSl = RightButtonSl,
+                    ButtonSr = RightButtonSr,
+                    ButtonR = ButtonR,
+                    ButtonZr = ButtonZr
+                },
+                LeftJoyconStick = new JoyconConfigKeyboardStick<Key>
+                {
+                    StickUp = LeftStickUp,
+                    StickDown = LeftStickDown,
+                    StickRight = LeftStickRight,
+                    StickLeft = LeftStickLeft,
+                    StickButton = LeftStickButton
+                },
                 RightJoyconStick = new JoyconConfigKeyboardStick<Key>
                 {
                     StickUp = RightStickUp,
                     StickDown = RightStickDown,
                     StickLeft = RightStickLeft,
                     StickRight = RightStickRight,
-                    StickButton = RightKeyboardStickButton
+                    StickButton = RightStickButton
                 },
                 Version = InputConfig.CurrentVersion
             };
diff --git a/src/Ryujinx.Ava/UI/Views/Input/ControllerInputView.axaml b/src/Ryujinx.Ava/UI/Views/Input/ControllerInputView.axaml
index 9f4974b5e..e96773bfa 100644
--- a/src/Ryujinx.Ava/UI/Views/Input/ControllerInputView.axaml
+++ b/src/Ryujinx.Ava/UI/Views/Input/ControllerInputView.axaml
@@ -142,7 +142,7 @@
                                     TextAlignment="Center" />
                                 <ToggleButton>
                                     <TextBlock
-                                        Text="{Binding Config.LeftControllerStickButton, Mode=TwoWay, Converter={StaticResource Key}}"
+                                        Text="{Binding Config.LeftStickButton, Mode=TwoWay, Converter={StaticResource Key}}"
                                         TextAlignment="Center" />
                                 </ToggleButton>
                             </StackPanel>
@@ -560,7 +560,7 @@
                         </StackPanel>
                     </Grid>
                 </Border>
-                <!-- Right Joystick -->
+                <!-- Right Buttons -->
                 <Border
                     BorderBrush="{DynamicResource ThemeControlBorderColor}"
                     BorderThickness="1"
@@ -674,7 +674,7 @@
                                     TextAlignment="Center" />
                                 <ToggleButton>
                                     <TextBlock
-                                        Text="{Binding Config.RightControllerStickButton, Mode=TwoWay, Converter={StaticResource Key}}"
+                                        Text="{Binding Config.RightStickButton, Mode=TwoWay, Converter={StaticResource Key}}"
                                         TextAlignment="Center" />
                                 </ToggleButton>
                             </StackPanel>
diff --git a/src/Ryujinx.Ava/UI/Views/Input/KeyboardInputView.axaml b/src/Ryujinx.Ava/UI/Views/Input/KeyboardInputView.axaml
index 10ae809c9..bd5e71b6e 100644
--- a/src/Ryujinx.Ava/UI/Views/Input/KeyboardInputView.axaml
+++ b/src/Ryujinx.Ava/UI/Views/Input/KeyboardInputView.axaml
@@ -143,7 +143,7 @@
                                     TextAlignment="Center" />
                                 <ToggleButton>
                                     <TextBlock
-                                        Text="{Binding Config.LeftKeyboardStickButton, Mode=TwoWay, Converter={StaticResource Key}}"
+                                        Text="{Binding Config.LeftStickButton, Mode=TwoWay, Converter={StaticResource Key}}"
                                         TextAlignment="Center" />
                                 </ToggleButton>
                             </StackPanel>
@@ -481,7 +481,7 @@
                         </StackPanel>
                     </Grid>
                 </Border>
-                <!-- Right Joystick -->
+                <!-- Right Buttons -->
                 <Border
                     BorderBrush="{DynamicResource ThemeControlBorderColor}"
                     BorderThickness="1"
@@ -596,7 +596,7 @@
                                     TextAlignment="Center" />
                                 <ToggleButton>
                                     <TextBlock
-                                        Text="{Binding Config.RightKeyboardStickButton, Mode=TwoWay, Converter={StaticResource Key}}"
+                                        Text="{Binding Config.RightStickButton, Mode=TwoWay, Converter={StaticResource Key}}"
                                         TextAlignment="Center" />
                                 </ToggleButton>
                             </StackPanel>