diff --git a/src/Ryujinx/Input/AutoAssignController.cs b/src/Ryujinx/Input/AutoAssignController.cs
index a5ed2e725..e6fc90a16 100644
--- a/src/Ryujinx/Input/AutoAssignController.cs
+++ b/src/Ryujinx/Input/AutoAssignController.cs
@@ -52,6 +52,8 @@ namespace Ryujinx.Ava.Input
             List<InputConfig> newConfig = ControllerAssignmentManager.GetConfiguredControllers(
                 controllers, oldConfig, out bool hasNewControllersConnected);
 
+            _viewModel.AppHost?.NpadManager.ReloadConfiguration(newConfig, _configurationState.Hid.EnableKeyboard, _configurationState.Hid.EnableMouse);
+            
             if (!hasNewControllersConnected)
             {
                 // there is no *new* controller, we must switch the order of the controllers in
@@ -60,7 +62,6 @@ namespace Ryujinx.Ava.Input
                 newConfig = ControllerAssignmentManager.ReorderControllers(newConfig, oldConfig);
             }
 
-            _viewModel.AppHost?.NpadManager.ReloadConfiguration(newConfig, _configurationState.Hid.EnableKeyboard, _configurationState.Hid.EnableMouse);
             _configurationState.Hid.InputConfig.Value = newConfig;
             
             // we want to save the configuration only if a *new* controller was connected