diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index 4694a2e73d5c..7722696245fd 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -514,18 +514,18 @@ const SearchReportModalStackNavigator = createModalStackNavigator<SearchReportPa
 
 const SearchAdvancedFiltersModalStackNavigator = createModalStackNavigator<SearchAdvancedFiltersParamList>({
     [SCREENS.SEARCH.ADVANCED_FILTERS_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchAdvancedFiltersPage').default,
-    [SCREENS.SEARCH.ADVANCED_FILTERS_DATE_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchFiltersDatePage').default,
-    [SCREENS.SEARCH.ADVANCED_FILTERS_CURRENCY_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchFiltersCurrencyPage').default,
-    [SCREENS.SEARCH.ADVANCED_FILTERS_DESCRIPTION_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchFiltersDescriptionPage').default,
-    [SCREENS.SEARCH.ADVANCED_FILTERS_MERCHANT_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchFiltersMerchantPage').default,
-    [SCREENS.SEARCH.ADVANCED_FILTERS_REPORT_ID_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchFiltersReportIDPage').default,
-    [SCREENS.SEARCH.ADVANCED_FILTERS_AMOUNT_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchFiltersAmountPage').default,
-    [SCREENS.SEARCH.ADVANCED_FILTERS_CATEGORY_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchFiltersCategoryPage').default,
-    [SCREENS.SEARCH.ADVANCED_FILTERS_KEYWORD_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchFiltersKeywordPage').default,
-    [SCREENS.SEARCH.ADVANCED_FILTERS_CARD_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchFiltersCardPage').default,
-    [SCREENS.SEARCH.ADVANCED_FILTERS_TAX_RATE_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchFiltersTaxRatePage').default,
-    [SCREENS.SEARCH.ADVANCED_FILTERS_EXPENSE_TYPE_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchFiltersExpenseTypePage').default,
-    [SCREENS.SEARCH.ADVANCED_FILTERS_TAG_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchFiltersTagPage').default,
+    [SCREENS.SEARCH.ADVANCED_FILTERS_DATE_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchAdvancedFiltersPage/SearchFiltersDatePage').default,
+    [SCREENS.SEARCH.ADVANCED_FILTERS_CURRENCY_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchAdvancedFiltersPage/SearchFiltersCurrencyPage').default,
+    [SCREENS.SEARCH.ADVANCED_FILTERS_DESCRIPTION_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchAdvancedFiltersPage/SearchFiltersDescriptionPage').default,
+    [SCREENS.SEARCH.ADVANCED_FILTERS_MERCHANT_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchAdvancedFiltersPage/SearchFiltersMerchantPage').default,
+    [SCREENS.SEARCH.ADVANCED_FILTERS_REPORT_ID_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportIDPage').default,
+    [SCREENS.SEARCH.ADVANCED_FILTERS_AMOUNT_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchAdvancedFiltersPage/SearchFiltersAmountPage').default,
+    [SCREENS.SEARCH.ADVANCED_FILTERS_CATEGORY_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage').default,
+    [SCREENS.SEARCH.ADVANCED_FILTERS_KEYWORD_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchAdvancedFiltersPage/SearchFiltersKeywordPage').default,
+    [SCREENS.SEARCH.ADVANCED_FILTERS_CARD_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchAdvancedFiltersPage/SearchFiltersCardPage').default,
+    [SCREENS.SEARCH.ADVANCED_FILTERS_TAX_RATE_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchAdvancedFiltersPage/SearchFiltersTaxRatePage').default,
+    [SCREENS.SEARCH.ADVANCED_FILTERS_EXPENSE_TYPE_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchAdvancedFiltersPage/SearchFiltersExpenseTypePage').default,
+    [SCREENS.SEARCH.ADVANCED_FILTERS_TAG_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage').default,
     [SCREENS.SEARCH.ADVANCED_FILTERS_FROM_RHP]: () => require<ReactComponentModule>('@pages/Search/SearchAdvancedFiltersPage/SearchFiltersFromPage').default,
     [SCREENS.SEARCH.ADVANCED_FILTERS_TO_RHP]: () => require<ReactComponentModule>('@pages/Search/SearchAdvancedFiltersPage/SearchFiltersToPage').default,
 });
diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
index 5143a2d70008..4b859e37785e 100644
--- a/src/pages/Search/AdvancedSearchFilters.tsx
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -225,31 +225,33 @@ function AdvancedSearchFilters() {
     };
 
     return (
-        <ScrollView contentContainerStyle={[styles.flexGrow1, styles.justifyContentBetween]}>
-            <View>
-                {advancedFilters.map((item) => {
-                    const onPress = singleExecution(waitForNavigate(() => Navigation.navigate(item.route)));
-                    if (item.shouldHide) {
-                        return undefined;
-                    }
-                    return (
-                        <MenuItemWithTopDescription
-                            key={item.description}
-                            title={item.title}
-                            description={translate(item.description)}
-                            shouldShowRightIcon
-                            onPress={onPress}
-                        />
-                    );
-                })}
-            </View>
+        <>
+            <ScrollView contentContainerStyle={[styles.flexGrow1, styles.justifyContentBetween]}>
+                <View>
+                    {advancedFilters.map((item) => {
+                        const onPress = singleExecution(waitForNavigate(() => Navigation.navigate(item.route)));
+                        if (item.shouldHide) {
+                            return undefined;
+                        }
+                        return (
+                            <MenuItemWithTopDescription
+                                key={item.description}
+                                title={item.title}
+                                description={translate(item.description)}
+                                shouldShowRightIcon
+                                onPress={onPress}
+                            />
+                        );
+                    })}
+                </View>
+            </ScrollView>
             <FormAlertWithSubmitButton
                 buttonText={translate('search.viewResults')}
                 containerStyles={[styles.m4, styles.mb5]}
                 onSubmit={onFormSubmit}
                 enabledWhenOffline
             />
-        </ScrollView>
+        </>
     );
 }
 
diff --git a/src/pages/Search/SearchFiltersAmountPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersAmountPage.tsx
similarity index 99%
rename from src/pages/Search/SearchFiltersAmountPage.tsx
rename to src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersAmountPage.tsx
index d7533f9ac20e..56eb3dce4350 100644
--- a/src/pages/Search/SearchFiltersAmountPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersAmountPage.tsx
@@ -44,6 +44,7 @@ function SearchFiltersAmountPage() {
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
             includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
         >
             <HeaderWithBackButton
                 title={translate('common.total')}
diff --git a/src/pages/Search/SearchFiltersCardPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCardPage.tsx
similarity index 99%
rename from src/pages/Search/SearchFiltersCardPage.tsx
rename to src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCardPage.tsx
index 4760dcdf0ff3..3ee7542da280 100644
--- a/src/pages/Search/SearchFiltersCardPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCardPage.tsx
@@ -88,6 +88,7 @@ function SearchFiltersCardPage() {
             testID={SearchFiltersCardPage.displayName}
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
+            shouldEnableMaxHeight
         >
             <HeaderWithBackButton
                 title={translate('common.card')}
diff --git a/src/pages/Search/SearchFiltersCategoryPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx
similarity index 98%
rename from src/pages/Search/SearchFiltersCategoryPage.tsx
rename to src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx
index de2cc283e7d5..1e37cdc60296 100644
--- a/src/pages/Search/SearchFiltersCategoryPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx
@@ -40,6 +40,7 @@ function SearchFiltersCategoryPage() {
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
             includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
         >
             <HeaderWithBackButton
                 title={translate('common.category')}
diff --git a/src/pages/Search/SearchFiltersCurrencyPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCurrencyPage.tsx
similarity index 98%
rename from src/pages/Search/SearchFiltersCurrencyPage.tsx
rename to src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCurrencyPage.tsx
index 018b7de775dc..b503a27b76fe 100644
--- a/src/pages/Search/SearchFiltersCurrencyPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCurrencyPage.tsx
@@ -46,6 +46,7 @@ function SearchFiltersCurrencyPage() {
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
             includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
         >
             <HeaderWithBackButton
                 title={translate('search.filters.currency')}
diff --git a/src/pages/Search/SearchFiltersDatePage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersDatePage.tsx
similarity index 98%
rename from src/pages/Search/SearchFiltersDatePage.tsx
rename to src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersDatePage.tsx
index 0ddf65f4fb20..b019a6995cec 100644
--- a/src/pages/Search/SearchFiltersDatePage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersDatePage.tsx
@@ -34,6 +34,7 @@ function SearchFiltersDatePage() {
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
             includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
         >
             <HeaderWithBackButton
                 title={translate('common.date')}
diff --git a/src/pages/Search/SearchFiltersDescriptionPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersDescriptionPage.tsx
similarity index 98%
rename from src/pages/Search/SearchFiltersDescriptionPage.tsx
rename to src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersDescriptionPage.tsx
index d1144cc5c5cd..bebcfe587cc2 100644
--- a/src/pages/Search/SearchFiltersDescriptionPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersDescriptionPage.tsx
@@ -36,6 +36,7 @@ function SearchFiltersDescriptionPage() {
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
             includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
         >
             <HeaderWithBackButton
                 title={translate('common.description')}
diff --git a/src/pages/Search/SearchFiltersExpenseTypePage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersExpenseTypePage.tsx
similarity index 98%
rename from src/pages/Search/SearchFiltersExpenseTypePage.tsx
rename to src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersExpenseTypePage.tsx
index 084e4bb65e3a..96984029142b 100644
--- a/src/pages/Search/SearchFiltersExpenseTypePage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersExpenseTypePage.tsx
@@ -40,6 +40,7 @@ function SearchFiltersExpenseTypePage() {
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
             includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
         >
             <HeaderWithBackButton
                 title={translate('search.expenseType')}
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersFromPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersFromPage.tsx
index aca90d3721d8..71918a8ee1de 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersFromPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersFromPage.tsx
@@ -21,6 +21,7 @@ function SearchFiltersFromPage() {
             includeSafeAreaPaddingBottom={false}
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
+            shouldEnableMaxHeight
         >
             <HeaderWithBackButton title={translate('common.from')} />
             <View style={[styles.flex1]}>
diff --git a/src/pages/Search/SearchFiltersKeywordPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersKeywordPage.tsx
similarity index 98%
rename from src/pages/Search/SearchFiltersKeywordPage.tsx
rename to src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersKeywordPage.tsx
index 3a0fb0a67367..41b1bcbc943b 100644
--- a/src/pages/Search/SearchFiltersKeywordPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersKeywordPage.tsx
@@ -36,6 +36,7 @@ function SearchFiltersKeywordPage() {
             testID={SearchFiltersKeywordPage.displayName}
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
+            shouldEnableMaxHeight
         >
             <FullPageNotFoundView shouldShow={false}>
                 <HeaderWithBackButton
diff --git a/src/pages/Search/SearchFiltersMerchantPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersMerchantPage.tsx
similarity index 98%
rename from src/pages/Search/SearchFiltersMerchantPage.tsx
rename to src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersMerchantPage.tsx
index 0290a654efc7..257e9f18177e 100644
--- a/src/pages/Search/SearchFiltersMerchantPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersMerchantPage.tsx
@@ -36,6 +36,7 @@ function SearchFiltersMerchantPage() {
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
             includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
         >
             <HeaderWithBackButton
                 title={translate('common.merchant')}
diff --git a/src/pages/Search/SearchFiltersReportIDPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportIDPage.tsx
similarity index 98%
rename from src/pages/Search/SearchFiltersReportIDPage.tsx
rename to src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportIDPage.tsx
index 174de0683fc2..052490890cf7 100644
--- a/src/pages/Search/SearchFiltersReportIDPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportIDPage.tsx
@@ -36,6 +36,7 @@ function SearchFiltersReportIDPage() {
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
             includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
         >
             <HeaderWithBackButton
                 title={translate('common.reportID')}
diff --git a/src/pages/Search/SearchFiltersTagPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx
similarity index 98%
rename from src/pages/Search/SearchFiltersTagPage.tsx
rename to src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx
index 8d9e73233d24..dd29afae79c5 100644
--- a/src/pages/Search/SearchFiltersTagPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx
@@ -43,6 +43,7 @@ function SearchFiltersTagPage() {
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
             includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
         >
             <HeaderWithBackButton
                 title={translate('common.tag')}
diff --git a/src/pages/Search/SearchFiltersTaxRatePage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTaxRatePage.tsx
similarity index 98%
rename from src/pages/Search/SearchFiltersTaxRatePage.tsx
rename to src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTaxRatePage.tsx
index ba2932f12a42..713e9f5110b2 100644
--- a/src/pages/Search/SearchFiltersTaxRatePage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTaxRatePage.tsx
@@ -47,6 +47,7 @@ function SearchFiltersTaxRatePage() {
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
             includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
         >
             <HeaderWithBackButton
                 title={translate('workspace.taxes.taxRate')}
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersToPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersToPage.tsx
index 6437b5a7e757..7c7ad1119b68 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersToPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersToPage.tsx
@@ -21,6 +21,7 @@ function SearchFiltersToPage() {
             includeSafeAreaPaddingBottom={false}
             shouldShowOfflineIndicatorInWideScreen
             offlineIndicatorStyle={styles.mtAuto}
+            shouldEnableMaxHeight
         >
             <HeaderWithBackButton title={translate('common.to')} />
             <View style={[styles.flex1]}>