diff --git a/src/components/ScreenWrapper.tsx b/src/components/ScreenWrapper.tsx
index 152a14fc3eb7..f927131f236b 100644
--- a/src/components/ScreenWrapper.tsx
+++ b/src/components/ScreenWrapper.tsx
@@ -26,7 +26,6 @@ import ImportedStateIndicator from './ImportedStateIndicator';
 import KeyboardAvoidingView from './KeyboardAvoidingView';
 import OfflineIndicator from './OfflineIndicator';
 import SafeAreaConsumer from './SafeAreaConsumer';
-import TestToolsModal from './TestToolsModal';
 import withNavigationFallback from './withNavigationFallback';
 
 type ScreenWrapperChildrenProps = {
@@ -276,7 +275,6 @@ function ScreenWrapper(
                                         enabled={shouldEnablePickerAvoiding}
                                     >
                                         <HeaderGap styles={headerGapStyles} />
-                                        <TestToolsModal />
                                         {isDevelopment && <CustomDevMenu />}
                                         <ScreenWrapperStatusContext.Provider value={contextValue}>
                                             {
diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.tsx b/src/libs/Navigation/AppNavigator/AuthScreens.tsx
index 68cc7e748413..6455954a3bda 100644
--- a/src/libs/Navigation/AppNavigator/AuthScreens.tsx
+++ b/src/libs/Navigation/AppNavigator/AuthScreens.tsx
@@ -9,6 +9,7 @@ import OptionsListContextProvider from '@components/OptionListContextProvider';
 import {SearchContextProvider} from '@components/Search/SearchContext';
 import {useSearchRouterContext} from '@components/Search/SearchRouter/SearchRouterContext';
 import SearchRouterModal from '@components/Search/SearchRouter/SearchRouterModal';
+import TestToolsModal from '@components/TestToolsModal';
 import useActiveWorkspace from '@hooks/useActiveWorkspace';
 import useOnboardingFlowRouter from '@hooks/useOnboardingFlow';
 import usePermissions from '@hooks/usePermissions';
@@ -378,9 +379,7 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie
 
         const unsubscribeDebugShortcut = KeyboardShortcut.subscribe(
             debugShortcutConfig.shortcutKey,
-            () => {
-                toggleTestToolsModal();
-            },
+            () => Modal.close(toggleTestToolsModal),
             debugShortcutConfig.descriptionKey,
             debugShortcutConfig.modifiers,
             true,
@@ -578,6 +577,7 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie
                         );
                     })}
                 </RootStack.Navigator>
+                <TestToolsModal />
                 <SearchRouterModal />
             </View>
             {didPusherInit && <ActiveGuidesEventListener />}