diff --git a/js/gamepad.js b/js/gamepad.js
index 4138885..2a0f649 100644
--- a/js/gamepad.js
+++ b/js/gamepad.js
@@ -134,7 +134,7 @@ class Gamepad {
                 let button;
                 for (let buttonIndex = 0; buttonIndex < gamepad.buttons.length; buttonIndex++) {
                     button = gamepad.buttons[buttonIndex];
-                    if (null === this.activeGamepadIndex && button.pressed) {
+                    if (button.pressed) {
                         this.mapGamepad(gamepad.index);
                     }
                 }