diff --git a/src/App/GamepadModal/GamepadModal.tsx b/src/App/GamepadModal/GamepadModal.tsx
index 2f12c579a..1ef0f2290 100644
--- a/src/App/GamepadModal/GamepadModal.tsx
+++ b/src/App/GamepadModal/GamepadModal.tsx
@@ -68,7 +68,7 @@ const GamepadModal = ({ onClose }: Props) => {
}, [gamepad]);
return createPortal((
-
+
diff --git a/src/services/GamepadNavigation/useContentGamepadNavigation.tsx b/src/services/GamepadNavigation/useContentGamepadNavigation.tsx
index a7d24f4d9..a3df6880b 100644
--- a/src/services/GamepadNavigation/useContentGamepadNavigation.tsx
+++ b/src/services/GamepadNavigation/useContentGamepadNavigation.tsx
@@ -6,6 +6,8 @@ import { useGamepad } from '../GamepadContext';
const FOCUSABLE = '[tabindex]:not([data-focus-guard])';
const getActiveScope = (fallback: HTMLDivElement | null): HTMLElement | null => {
+ if (document.querySelector('[data-gamepad-modal]')) return null;
+
const modals = document.querySelectorAll('.modals-container');
for (const modal of modals) {
if (modal.children.length > 0) return modal;