diff --git a/src/view/shell/createNativeStackNavigatorWithAuth.tsx b/src/view/shell/createNativeStackNavigatorWithAuth.tsx
index 5de4ae91a7..cd009d9d03 100644
--- a/src/view/shell/createNativeStackNavigatorWithAuth.tsx
+++ b/src/view/shell/createNativeStackNavigatorWithAuth.tsx
@@ -35,7 +35,6 @@ import {
   useLoggedOutViewControls,
 } from '#/state/shell/logged-out'
 import {LoggedOut} from '#/view/com/auth/LoggedOut'
-import {ModalsContainer} from '#/view/com/modals/Modal'
 import {Deactivated} from '#/screens/Deactivated'
 import {Onboarding} from '#/screens/Onboarding'
 import {SignupQueued} from '#/screens/SignupQueued'
@@ -177,7 +176,6 @@ function NativeStackNavigator({
       )}
 
       {/* Start: individual dialogs and outlets */}
-      <ModalsContainer />
       <MutedWordsDialog />
       <SigninDialog />
       <EmailDialog />
diff --git a/src/view/shell/index.tsx b/src/view/shell/index.tsx
index e3d2237921..f3232e06e4 100644
--- a/src/view/shell/index.tsx
+++ b/src/view/shell/index.tsx
@@ -21,6 +21,7 @@ import {
 } from '#/state/shell'
 import {useCloseAnyActiveElement} from '#/state/util'
 import {Lightbox} from '#/view/com/lightbox/Lightbox'
+import {ModalsContainer} from '#/view/com/modals/Modal'
 import {ErrorBoundary} from '#/view/com/util/ErrorBoundary'
 import {atoms as a, select, useTheme} from '#/alf'
 import {setSystemUITheme} from '#/alf/util/systemUI'
@@ -143,6 +144,7 @@ function ShellInner() {
         </ErrorBoundary>
       </View>
       <Composer winHeight={winDim.height} />
+      <ModalsContainer />
       <Lightbox />
     </>
   )