diff --git a/Ryujinx/Configuration.cs b/Ryujinx/Configuration.cs
index 774c9250a9..38208b68cf 100644
--- a/Ryujinx/Configuration.cs
+++ b/Ryujinx/Configuration.cs
@@ -289,7 +289,10 @@ namespace Ryujinx
             device.System.UseLegacyJit = SwitchConfig.EnableLegacyJit;
 
             ServiceConfiguration.IgnoreMissingServices = SwitchConfig.IgnoreMissingServices;
-
+        }
+       
+        public static void ConfigureHid(Switch device, Configuration SwitchConfig) 
+        {   
             if (SwitchConfig.JoystickControls.Enabled)
             {
                 if (!Joystick.GetState(SwitchConfig.JoystickControls.Index).IsConnected)
diff --git a/Ryujinx/Ui/MainWindow.cs b/Ryujinx/Ui/MainWindow.cs
index b7d66f4c70..f8958338c9 100644
--- a/Ryujinx/Ui/MainWindow.cs
+++ b/Ryujinx/Ui/MainWindow.cs
@@ -310,6 +310,8 @@ namespace Ryujinx.UI
 
         private static void CreateGameWindow()
         {
+            Configuration.ConfigureHid(_device, SwitchSettings.SwitchConfig);
+            
             using (GlScreen screen = new GlScreen(_device, _renderer))
             {
                 screen.MainLoop();