diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx index 78d4afe0e805..d5935d698a17 100644 --- a/src/components/SelectionList/BaseSelectionList.tsx +++ b/src/components/SelectionList/BaseSelectionList.tsx @@ -652,9 +652,8 @@ function BaseSelectionList( useEffect(() => { // Avoid changing focus if the textInputValue remains unchanged. if ( - (prevTextInputValue === textInputValue && flattenedSections.selectedOptions.length === prevSelectedOptionsLength) || - flattenedSections.allOptions.length === 0 || - shouldUpdateFocusedIndex + (prevTextInputValue === textInputValue && flattenedSections.selectedOptions.length === prevSelectedOptionsLength && !shouldUpdateFocusedIndex) || + flattenedSections.allOptions.length === 0 ) { return; }