diff --git a/src/CONST/index.ts b/src/CONST/index.ts index ae37de14951bc..f76682c3f1e9b 100755 --- a/src/CONST/index.ts +++ b/src/CONST/index.ts @@ -5177,7 +5177,7 @@ const CONST = { * The maximum count of items per page for SelectionList. * When paginate, it multiplies by page number. */ - MAX_SELECTION_LIST_PAGE_LENGTH: 500, + MAX_SELECTION_LIST_PAGE_LENGTH: 50, /** * Bank account names diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx index f8116710869bb..f544a65442a97 100644 --- a/src/components/SelectionList/BaseSelectionList.tsx +++ b/src/components/SelectionList/BaseSelectionList.tsx @@ -771,7 +771,9 @@ function BaseSelectionList( : 0; // Reset the current page to 1 when the user types something - setCurrentPage(1); + if (prevTextInputValue !== textInputValue) { + setCurrentPage(1); + } updateAndScrollToFocusedIndex(newSelectedIndex); }, [