diff --git a/src/components/FocusTrap/FocusTrapForScreen/index.web.tsx b/src/components/FocusTrap/FocusTrapForScreen/index.web.tsx
index 6a1409ab4a93..d81293729b94 100644
--- a/src/components/FocusTrap/FocusTrapForScreen/index.web.tsx
+++ b/src/components/FocusTrap/FocusTrapForScreen/index.web.tsx
@@ -1,12 +1,14 @@
 import {useFocusEffect, useIsFocused, useRoute} from '@react-navigation/native';
 import FocusTrap from 'focus-trap-react';
 import React, {useCallback, useMemo} from 'react';
+import {useOnyx} from 'react-native-onyx';
 import BOTTOM_TAB_SCREENS from '@components/FocusTrap/BOTTOM_TAB_SCREENS';
-import SCREENS_WITH_AUTOFOCUS from '@components/FocusTrap/SCREENS_WITH_AUTOFOCUS';
+import getScreenWithAutofocus from '@components/FocusTrap/SCREENS_WITH_AUTOFOCUS';
 import sharedTrapStack from '@components/FocusTrap/sharedTrapStack';
 import TOP_TAB_SCREENS from '@components/FocusTrap/TOP_TAB_SCREENS';
 import WIDE_LAYOUT_INACTIVE_SCREENS from '@components/FocusTrap/WIDE_LAYOUT_INACTIVE_SCREENS';
 import useWindowDimensions from '@hooks/useWindowDimensions';
+import ONYXKEYS from '@src/ONYXKEYS';
 import type FocusTrapProps from './FocusTrapProps';
 
 let activeRouteName = '';
@@ -14,6 +16,8 @@ function FocusTrapForScreen({children}: FocusTrapProps) {
     const isFocused = useIsFocused();
     const route = useRoute();
     const {isSmallScreenWidth} = useWindowDimensions();
+    const [isAuthenticated] = useOnyx(ONYXKEYS.SESSION, {selector: (session) => !!session?.authToken});
+    const screensWithAutofocus = useMemo(() => getScreenWithAutofocus(!!isAuthenticated), [isAuthenticated]);
 
     const isActive = useMemo(() => {
         // Focus trap can't be active on bottom tab screens because it would block access to the tab bar.
@@ -49,13 +53,13 @@ function FocusTrapForScreen({children}: FocusTrapProps) {
                 fallbackFocus: document.body,
                 // We don't want to ovverride autofocus on these screens.
                 initialFocus: () => {
-                    if (SCREENS_WITH_AUTOFOCUS.includes(activeRouteName)) {
+                    if (screensWithAutofocus.includes(activeRouteName)) {
                         return false;
                     }
                     return undefined;
                 },
                 setReturnFocus: (element) => {
-                    if (SCREENS_WITH_AUTOFOCUS.includes(activeRouteName)) {
+                    if (screensWithAutofocus.includes(activeRouteName)) {
                         return false;
                     }
                     return element;
diff --git a/src/components/FocusTrap/SCREENS_WITH_AUTOFOCUS.ts b/src/components/FocusTrap/SCREENS_WITH_AUTOFOCUS.ts
index 2a77b52e3116..7af327d35ac4 100644
--- a/src/components/FocusTrap/SCREENS_WITH_AUTOFOCUS.ts
+++ b/src/components/FocusTrap/SCREENS_WITH_AUTOFOCUS.ts
@@ -1,4 +1,5 @@
 import {CENTRAL_PANE_WORKSPACE_SCREENS} from '@libs/Navigation/AppNavigator/Navigators/FullScreenNavigator';
+import NAVIGATORS from '@src/NAVIGATORS';
 import SCREENS from '@src/SCREENS';
 
 const SCREENS_WITH_AUTOFOCUS: string[] = [
@@ -10,6 +11,14 @@ const SCREENS_WITH_AUTOFOCUS: string[] = [
     SCREENS.SETTINGS.PROFILE.PRONOUNS,
     SCREENS.NEW_TASK.DETAILS,
     SCREENS.MONEY_REQUEST.CREATE,
+    SCREENS.SIGN_IN_ROOT,
 ];
 
-export default SCREENS_WITH_AUTOFOCUS;
+function getScreenWithAutofocus(isAuthenticated: boolean) {
+    if (!isAuthenticated) {
+        return [...SCREENS_WITH_AUTOFOCUS, NAVIGATORS.BOTTOM_TAB_NAVIGATOR];
+    }
+    return SCREENS_WITH_AUTOFOCUS;
+}
+
+export default getScreenWithAutofocus;
diff --git a/src/pages/signin/LoginForm/BaseLoginForm.tsx b/src/pages/signin/LoginForm/BaseLoginForm.tsx
index 1c8084eb12e2..49e7479c0435 100644
--- a/src/pages/signin/LoginForm/BaseLoginForm.tsx
+++ b/src/pages/signin/LoginForm/BaseLoginForm.tsx
@@ -267,7 +267,6 @@ function BaseLoginForm({account, credentials, closeAccount, blurOnSubmit = false
                     onSubmitEditing={validateAndSubmitForm}
                     autoCapitalize="none"
                     autoCorrect={false}
-                    autoFocus
                     inputMode={CONST.INPUT_MODE.EMAIL}
                     errorText={formError}
                     hasError={shouldShowServerError}