diff --git a/src/Ryujinx/UI/Models/Input/ControllerInputConfig.cs b/src/Ryujinx/UI/Models/Input/ControllerInputConfig.cs
index 550399b697..9fe29d37f6 100644
--- a/src/Ryujinx/UI/Models/Input/ControllerInputConfig.cs
+++ b/src/Ryujinx/UI/Models/Input/ControllerInputConfig.cs
@@ -504,7 +504,7 @@ namespace Ryujinx.Ava.UI.Models.Input
                     ButtonMinus = ButtonMinus,
                     ButtonSl = LeftButtonSl,
                     ButtonSr = LeftButtonSr,
-                    ButtonZl = ButtonZl
+                    ButtonZl = ButtonZl,
                 },
                 RightJoycon = new RightJoyconCommonConfig<GamepadInputId>
                 {
@@ -516,7 +516,7 @@ namespace Ryujinx.Ava.UI.Models.Input
                     ButtonSl = RightButtonSl,
                     ButtonSr = RightButtonSr,
                     ButtonR = ButtonR,
-                    ButtonZr = ButtonZr
+                    ButtonZr = ButtonZr,
                 },
                 LeftJoyconStick = new JoyconConfigControllerStick<GamepadInputId, StickInputId>
                 {
@@ -524,7 +524,7 @@ namespace Ryujinx.Ava.UI.Models.Input
                     InvertStickX = LeftInvertStickX,
                     InvertStickY = LeftInvertStickY,
                     Rotate90CW = LeftRotate90,
-                    StickButton = LeftStickButton
+                    StickButton = LeftStickButton,
                 },
                 RightJoyconStick = new JoyconConfigControllerStick<GamepadInputId, StickInputId>
                 {
@@ -532,20 +532,20 @@ namespace Ryujinx.Ava.UI.Models.Input
                     InvertStickX = RightInvertStickX,
                     InvertStickY = RightInvertStickY,
                     Rotate90CW = RightRotate90,
-                    StickButton = RightStickButton
+                    StickButton = RightStickButton,
                 },
                 Rumble = new RumbleConfigController
                 {
                     EnableRumble = EnableRumble,
                     WeakRumble = WeakRumble,
-                    StrongRumble = StrongRumble
+                    StrongRumble = StrongRumble,
                 },
                 Version = InputConfig.CurrentVersion,
                 DeadzoneLeft = DeadzoneLeft,
                 DeadzoneRight = DeadzoneRight,
                 RangeLeft = RangeLeft,
                 RangeRight = RangeRight,
-                TriggerThreshold = TriggerThreshold
+                TriggerThreshold = TriggerThreshold,
             };
 
             if (EnableCemuHookMotion)
@@ -560,7 +560,7 @@ namespace Ryujinx.Ava.UI.Models.Input
                     DsuServerPort = DsuServerPort,
                     Slot = Slot,
                     AltSlot = AltSlot,
-                    MirrorInput = MirrorInput
+                    MirrorInput = MirrorInput,
                 };
             }
             else
@@ -570,7 +570,7 @@ namespace Ryujinx.Ava.UI.Models.Input
                     EnableMotion = EnableMotion,
                     MotionBackend = MotionInputBackendType.GamepadDriver,
                     GyroDeadzone = GyroDeadzone,
-                    Sensitivity = Sensitivity
+                    Sensitivity = Sensitivity,
                 };
             }
 
diff --git a/src/Ryujinx/UI/Models/Input/HotkeysConfig.cs b/src/Ryujinx/UI/Models/Input/HotkeysConfig.cs
index 04fa602db0..534271d335 100644
--- a/src/Ryujinx/UI/Models/Input/HotkeysConfig.cs
+++ b/src/Ryujinx/UI/Models/Input/HotkeysConfig.cs
@@ -132,7 +132,7 @@ namespace Ryujinx.Ava.UI.Models.Input
                 ResScaleUp = ResScaleUp,
                 ResScaleDown = ResScaleDown,
                 VolumeUp = VolumeUp,
-                VolumeDown = VolumeDown
+                VolumeDown = VolumeDown,
             };
 
             return config;
diff --git a/src/Ryujinx/UI/Models/Input/KeyboardInputConfig.cs b/src/Ryujinx/UI/Models/Input/KeyboardInputConfig.cs
index 029565210c..66f1f62a22 100644
--- a/src/Ryujinx/UI/Models/Input/KeyboardInputConfig.cs
+++ b/src/Ryujinx/UI/Models/Input/KeyboardInputConfig.cs
@@ -383,7 +383,7 @@ namespace Ryujinx.Ava.UI.Models.Input
                     ButtonMinus = ButtonMinus,
                     ButtonZl = ButtonZl,
                     ButtonSl = LeftButtonSl,
-                    ButtonSr = LeftButtonSr
+                    ButtonSr = LeftButtonSr,
                 },
                 RightJoycon = new RightJoyconCommonConfig<Key>
                 {
@@ -395,7 +395,7 @@ namespace Ryujinx.Ava.UI.Models.Input
                     ButtonSl = RightButtonSl,
                     ButtonSr = RightButtonSr,
                     ButtonR = ButtonR,
-                    ButtonZr = ButtonZr
+                    ButtonZr = ButtonZr,
                 },
                 LeftJoyconStick = new JoyconConfigKeyboardStick<Key>
                 {
@@ -403,7 +403,7 @@ namespace Ryujinx.Ava.UI.Models.Input
                     StickDown = LeftStickDown,
                     StickRight = LeftStickRight,
                     StickLeft = LeftStickLeft,
-                    StickButton = LeftStickButton
+                    StickButton = LeftStickButton,
                 },
                 RightJoyconStick = new JoyconConfigKeyboardStick<Key>
                 {
@@ -411,9 +411,9 @@ namespace Ryujinx.Ava.UI.Models.Input
                     StickDown = RightStickDown,
                     StickLeft = RightStickLeft,
                     StickRight = RightStickRight,
-                    StickButton = RightStickButton
+                    StickButton = RightStickButton,
                 },
-                Version = InputConfig.CurrentVersion
+                Version = InputConfig.CurrentVersion,
             };
 
             return config;
diff --git a/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs b/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs
index 58311a9edb..635f00892d 100644
--- a/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml.cs
@@ -54,7 +54,7 @@ namespace Ryujinx.Ava.UI.Views.Input
                     {
                         _currentAssigner = new ButtonKeyAssigner(button);
 
-                        this.Focus(NavigationMethod.Pointer);
+                        Focus(NavigationMethod.Pointer);
 
                         PointerPressed += MouseClick;
 
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs b/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
index 5f675c3586..e1476586b0 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
@@ -28,6 +28,7 @@ namespace Ryujinx.Ava.UI.Views.Settings
                     button.IsCheckedChanged += Button_IsCheckedChanged;
                 }
             }
+
             _avaloniaKeyboardDriver = new AvaloniaKeyboardDriver(this);
         }