diff --git a/javascript/imageviewerGamepad.js b/javascript/imageviewerGamepad.js
index 29bd71403..db932bcaa 100644
--- a/javascript/imageviewerGamepad.js
+++ b/javascript/imageviewerGamepad.js
@@ -1,36 +1,33 @@
-    let delay = 350//ms
-    window.addEventListener('gamepadconnected', (e) => {
-        console.log("Gamepad connected!")
-        const gamepad = e.gamepad;
-        setInterval(() => {
-            const xValue = gamepad.axes[0].toFixed(2);
-            if (xValue < -0.3) {
-                modalPrevImage(e);
-            } else if (xValue > 0.3) {
-                modalNextImage(e);
-            }
-
-        }, delay);
-    });
-
-
-    /*
-    Primarily for vr controller type pointer devices.
-    I use the wheel event because there's currently no way to do it properly with web xr.
-     */
-
-    let isScrolling = false;
-    window.addEventListener('wheel', (e) => {
-        if (isScrolling) return;
-        isScrolling = true;
-
-        if (e.deltaX <= -0.6) {
+const delay = 250//ms
+window.addEventListener('gamepadconnected', (e) => {
+    setInterval(() => {
+        if (!opts.js_modal_lightbox_gamepad) return;
+        const gamepad = navigator.getGamepads()[0];
+        const xValue = gamepad.axes[0];
+        if (xValue < -0.3) {
             modalPrevImage(e);
-        } else if (e.deltaX >= 0.6) {
+        } else if (xValue > 0.3) {
             modalNextImage(e);
         }
+    }, delay);
+});
 
-        setTimeout(() => {
-            isScrolling = false;
-        }, delay);
-    });
\ No newline at end of file
+/*
+Primarily for vr controller type pointer devices.
+I use the wheel event because there's currently no way to do it properly with web xr.
+ */
+let isScrolling = false;
+window.addEventListener('wheel', (e) => {
+    if (!opts.js_modal_lightbox_gamepad || isScrolling) return;
+    isScrolling = true;
+
+    if (e.deltaX <= -0.6) {
+        modalPrevImage(e);
+    } else if (e.deltaX >= 0.6) {
+        modalNextImage(e);
+    }
+
+    setTimeout(() => {
+        isScrolling = false;
+    }, delay);
+});
diff --git a/modules/shared.py b/modules/shared.py
index 6a2b3c2bd..977ff16b6 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -399,6 +399,7 @@ options_templates.update(options_section(('ui', "User interface"), {
     "font": OptionInfo("", "Font for image grids that have text"),
     "js_modal_lightbox": OptionInfo(True, "Enable full page image viewer"),
     "js_modal_lightbox_initially_zoomed": OptionInfo(True, "Show images zoomed in by default in full page image viewer"),
+    "js_modal_lightbox_gamepad": OptionInfo(True, "Navagete image viewer with gamepad"),
     "show_progress_in_title": OptionInfo(True, "Show generation progress in window title."),
     "samplers_in_dropdown": OptionInfo(True, "Use dropdown for sampler selection instead of radio group"),
     "dimensions_and_batch_together": OptionInfo(True, "Show Width/Height and Batch sliders in same row"),