diff --git a/javascript/imageviewerGamepad.js b/javascript/imageviewerGamepad.js
index 45cc4cbf9..a22c7e6e6 100644
--- a/javascript/imageviewerGamepad.js
+++ b/javascript/imageviewerGamepad.js
@@ -24,7 +24,10 @@ window.addEventListener('gamepadconnected', (e) => {
             isWaiting = false;
         }
     }, 10);
-    window.addEventListener('gamepaddisconnected', (e) => clearInterval(gamepads[e.gamepad.index]));
+});
+
+window.addEventListener('gamepaddisconnected', (e) => {
+    clearInterval(gamepads[e.gamepad.index]);
 });
 
 /*