diff --git a/test/testcontroller.c b/test/testcontroller.c
index 74c4ed10dc..6b5874156b 100644
--- a/test/testcontroller.c
+++ b/test/testcontroller.c
@@ -1077,6 +1077,7 @@ static void HandleGamepadAdded(SDL_JoystickID id, bool verbose)
     }
 
     HandleGamepadRemapped(id);
+    SetController(id);
 }
 
 static void HandleGamepadRemoved(SDL_JoystickID id)