diff --git a/test/controllermap.c b/test/controllermap.c
index d55dc8046..f81528ea2 100644
--- a/test/controllermap.c
+++ b/test/controllermap.c
@@ -746,7 +746,7 @@ main(int argc, char *argv[])
         return 2;
     }
 
-    while (SDL_NumJoysticks() == 0) {
+    while (!done && SDL_NumJoysticks() == 0) {
         SDL_Event event;
 
         while (SDL_PollEvent(&event) > 0) {