diff --git a/src/hooks/useArrowKeyFocusManager.ts b/src/hooks/useArrowKeyFocusManager.ts
index 458a39d91ca5..7a674b46c337 100644
--- a/src/hooks/useArrowKeyFocusManager.ts
+++ b/src/hooks/useArrowKeyFocusManager.ts
@@ -132,7 +132,7 @@ export default function useArrowKeyFocusManager({
 
                 if (newFocusedIndex > maxIndex) {
                     if (disableCyclicTraversal) {
-                        break;
+                        return actualIndex;
                     }
                     newFocusedIndex = 0;
                 }