diff --git a/src/services/GamepadNavigation/useContentGamepadNavigation.tsx b/src/services/GamepadNavigation/useContentGamepadNavigation.tsx index fb73b6789..938ce9e31 100644 --- a/src/services/GamepadNavigation/useContentGamepadNavigation.tsx +++ b/src/services/GamepadNavigation/useContentGamepadNavigation.tsx @@ -92,8 +92,10 @@ const useContentGamepadNavigation = ( elements[0].focus(); return; } - - activeElement?.click(); + const isActiveSelectElement = [activeElement.classList].some((className) => /^select-input/.test(className.toString())); + if(!isActiveSelectElement) { + activeElement?.click(); + } }; gamepad?.on('analog', gamepadHandlerId, handleGamepadNavigation);