diff --git a/src/components/SelectionList/SelectionListWithSections/BaseSelectionListWithSections.tsx b/src/components/SelectionList/SelectionListWithSections/BaseSelectionListWithSections.tsx index 3237d0760fb8..4dd78cbe0a71 100644 --- a/src/components/SelectionList/SelectionListWithSections/BaseSelectionListWithSections.tsx +++ b/src/components/SelectionList/SelectionListWithSections/BaseSelectionListWithSections.tsx @@ -186,7 +186,7 @@ function BaseSelectionListWithSections({ useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.ENTER, selectFocusedItem, { captureOnInputs: true, - shouldBubble: !getFocusedItem(), + shouldBubble: itemsCount > 0 && !getFocusedItem(), shouldStopPropagation, isActive: !disableKeyboardShortcuts && isScreenFocused && focusedIndex >= 0 && !disableEnterShortcut, }); @@ -203,7 +203,7 @@ function BaseSelectionListWithSections({ }, { captureOnInputs: true, - shouldBubble: !getFocusedItem(), + shouldBubble: itemsCount > 0 && !getFocusedItem(), isActive: !disableKeyboardShortcuts && isScreenFocused && !confirmButtonOptions?.isDisabled, }, );