diff --git a/src/Ryujinx.Input.SDL2/SDL2GamepadDriver.cs b/src/Ryujinx.Input.SDL2/SDL2GamepadDriver.cs
index dcbe92550..13e5ebfd0 100644
--- a/src/Ryujinx.Input.SDL2/SDL2GamepadDriver.cs
+++ b/src/Ryujinx.Input.SDL2/SDL2GamepadDriver.cs
@@ -117,7 +117,10 @@ namespace Ryujinx.Input.SDL2
                 {
                     lock (_lock)
                     {
-                        _gamepadsIds.Insert(joystickDeviceId, id);
+                        if (joystickDeviceId <= _gamepadsIds.FindLastIndex(_ => true))
+                            _gamepadsIds.Insert(joystickDeviceId, id);
+                        else
+                            _gamepadsIds.Add(id);
                     }
 
                     OnGamepadConnected?.Invoke(id);