diff --git a/src/components/CategoryPicker/index.js b/src/components/CategoryPicker/index.js
index 90f72f183815..ee591a851c13 100644
--- a/src/components/CategoryPicker/index.js
+++ b/src/components/CategoryPicker/index.js
@@ -31,21 +31,36 @@ function CategoryPicker({selectedCategory, policyCategories, policyRecentlyUsedC
         ];
     }, [selectedCategory]);
 
+    const sections = useMemo(() => {
+        const {categoryOptions} = OptionsListUtils.getFilteredOptions(
+            {},
+            {},
+            [],
+            searchValue,
+            selectedOptions,
+            [],
+            false,
+            false,
+            true,
+            policyCategories,
+            policyRecentlyUsedCategories,
+            false,
+        );
+
+        return categoryOptions;
+    }, [policyCategories, policyRecentlyUsedCategories, searchValue, selectedOptions]);
+
     const initialFocusedIndex = useMemo(() => {
-        if (isCategoriesCountBelowThreshold && selectedOptions.length > 0) {
-            return _.chain(policyCategories)
-                .values()
-                .findIndex((category) => category.name === selectedOptions[0].name, true)
-                .value();
-        }
+        let categoryInitialFocusedIndex = 0;
 
-        return 0;
-    }, [policyCategories, selectedOptions, isCategoriesCountBelowThreshold]);
+        if (!_.isEmpty(searchValue) || isCategoriesCountBelowThreshold) {
+            const index = _.findIndex(lodashGet(sections, '[0].data', []), (category) => category.searchText === iou.category);
 
-    const sections = useMemo(
-        () => OptionsListUtils.getFilteredOptions({}, {}, [], searchValue, selectedOptions, [], false, false, true, policyCategories, policyRecentlyUsedCategories, false).categoryOptions,
-        [policyCategories, policyRecentlyUsedCategories, searchValue, selectedOptions],
-    );
+            categoryInitialFocusedIndex = index === -1 ? 0 : index;
+        }
+
+        return categoryInitialFocusedIndex;
+    }, [iou.category, searchValue, isCategoriesCountBelowThreshold, sections]);
 
     const headerMessage = OptionsListUtils.getHeaderMessage(lodashGet(sections, '[0].data.length', 0) > 0, false, searchValue);
     const shouldShowTextInput = !isCategoriesCountBelowThreshold;
diff --git a/src/components/HeaderPageLayout.js b/src/components/HeaderPageLayout.js
index 17c2255593e9..c53ec37a0b34 100644
--- a/src/components/HeaderPageLayout.js
+++ b/src/components/HeaderPageLayout.js
@@ -68,7 +68,7 @@ function HeaderPageLayout({backgroundColor, children, footer, headerContainerSty
                         titleColor={titleColor}
                         iconFill={iconFill}
                     />
-                    <View style={[styles.flex1, appBGColor, !isOffline ? safeAreaPaddingBottomStyle : {}]}>
+                    <View style={[styles.flex1, appBGColor, !isOffline && !_.isNull(footer) ? safeAreaPaddingBottomStyle : {}]}>
                         {/** Safari on ios/mac has a bug where overscrolling the page scrollview shows green background color. This is a workaround to fix that. https://github.com/Expensify/App/issues/23422 */}
                         {Browser.isSafari() && (
                             <View style={styles.dualColorOverscrollSpacer}>
diff --git a/src/components/OptionsSelector/BaseOptionsSelector.js b/src/components/OptionsSelector/BaseOptionsSelector.js
index bff9f8b6d7d0..aa02701b1c98 100755
--- a/src/components/OptionsSelector/BaseOptionsSelector.js
+++ b/src/components/OptionsSelector/BaseOptionsSelector.js
@@ -107,13 +107,13 @@ class BaseOptionsSelector extends Component {
             });
             return;
         }
-        const newFocusedIndex = this.props.selectedOptions.length;
 
+        const newFocusedIndex = this.props.selectedOptions.length;
         // eslint-disable-next-line react/no-did-update-set-state
         this.setState(
             {
                 allOptions: newOptions,
-                focusedIndex: newFocusedIndex,
+                focusedIndex: _.isNumber(this.props.initialFocusedIndex) ? this.props.initialFocusedIndex : newFocusedIndex,
             },
             () => {
                 // If we just toggled an option on a multi-selection page or cleared the search input, scroll to top
diff --git a/src/libs/migrateOnyx.js b/src/libs/migrateOnyx.js
index 588e1a5642aa..4a115536e654 100644
--- a/src/libs/migrateOnyx.js
+++ b/src/libs/migrateOnyx.js
@@ -1,6 +1,5 @@
 import _ from 'underscore';
 import Log from './Log';
-import AddEncryptedAuthToken from './migrations/AddEncryptedAuthToken';
 import RenamePriorityModeKey from './migrations/RenamePriorityModeKey';
 import RenameExpensifyNewsStatus from './migrations/RenameExpensifyNewsStatus';
 import AddLastVisibleActionCreated from './migrations/AddLastVisibleActionCreated';
@@ -13,7 +12,7 @@ export default function () {
 
     return new Promise((resolve) => {
         // Add all migrations to an array so they are executed in order
-        const migrationPromises = [RenamePriorityModeKey, AddEncryptedAuthToken, RenameExpensifyNewsStatus, AddLastVisibleActionCreated, PersonalDetailsByAccountID, RenameReceiptFilename];
+        const migrationPromises = [RenamePriorityModeKey, RenameExpensifyNewsStatus, AddLastVisibleActionCreated, PersonalDetailsByAccountID, RenameReceiptFilename];
 
         // Reduce all promises down to a single promise. All promises run in a linear fashion, waiting for the
         // previous promise to finish before moving onto the next one.
diff --git a/src/libs/migrations/AddEncryptedAuthToken.js b/src/libs/migrations/AddEncryptedAuthToken.js
deleted file mode 100644
index 1c8d6a1e2a43..000000000000
--- a/src/libs/migrations/AddEncryptedAuthToken.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/* eslint-disable rulesdir/no-api-in-views */
-import _ from 'underscore';
-import Onyx from 'react-native-onyx';
-import Log from '../Log';
-import ONYXKEYS from '../../ONYXKEYS';
-import * as Authentication from '../Authentication';
-
-/**
- * This migration adds an encryptedAuthToken to the SESSION key, if it is not present.
- *
- * @returns {Promise}
- */
-export default function () {
-    return new Promise((resolve) => {
-        const connectionID = Onyx.connect({
-            key: ONYXKEYS.SESSION,
-            callback: (session) => {
-                Onyx.disconnect(connectionID);
-
-                if (session && !_.isEmpty(session.encryptedAuthToken)) {
-                    Log.info('[Migrate Onyx] Skipped migration AddEncryptedAuthToken');
-                    return resolve();
-                }
-
-                if (!session || !session.authToken) {
-                    Log.info('[Migrate Onyx] Skipped migration AddEncryptedAuthToken');
-                    return resolve();
-                }
-
-                // If there is an auth token but no encrypted auth token, reauthenticate.
-                if (session.authToken && _.isUndefined(session.encryptedAuthToken)) {
-                    return Authentication.reauthenticate('Onyx_Migration_AddEncryptedAuthToken').then(() => {
-                        Log.info('[Migrate Onyx] Ran migration AddEncryptedAuthToken');
-                        return resolve();
-                    });
-                }
-
-                return resolve();
-            },
-        });
-    });
-}