diff --git a/src/services/GamepadNavigation/useVerticalNavGamepadNavigation.tsx b/src/services/GamepadNavigation/useVerticalNavGamepadNavigation.tsx
index 4f3b8d379..041b4e66c 100644
--- a/src/services/GamepadNavigation/useVerticalNavGamepadNavigation.tsx
+++ b/src/services/GamepadNavigation/useVerticalNavGamepadNavigation.tsx
@@ -3,7 +3,7 @@
 import { useEffect } from 'react';
 import { useGamepad } from '../GamepadContext';
 
-const ROUTES = ['board', 'discover', 'library', 'calendar', 'addons', 'settings'];
+const ROUTES = ['search', 'board', 'discover', 'library', 'calendar', 'addons', 'settings'];
 
 const useVerticalGamepadNavigation = (_sectionRef: React.RefObject<HTMLDivElement>, currentRoute: string) => {
     const gamepad = useGamepad();
@@ -18,7 +18,7 @@ const useVerticalGamepadNavigation = (_sectionRef: React.RefObject<HTMLDivElemen
             if (direction === 'prev') nextIndex = Math.max(currentIndex - 1, 0);
 
             if (nextIndex !== currentIndex) {
-                document.dispatchEvent(new KeyboardEvent('keydown', { key: String(nextIndex + 1), code: `Digit${nextIndex + 1}`, bubbles: true }));
+                document.dispatchEvent(new KeyboardEvent('keydown', { key: String(nextIndex), code: `Digit${nextIndex}`, bubbles: true }));
             }
         };