diff --git a/src/view/com/lightbox/Lightbox.tsx b/src/features/lightbox/Lightbox.tsx
similarity index 100%
rename from src/view/com/lightbox/Lightbox.tsx
rename to src/features/lightbox/Lightbox.tsx
diff --git a/src/view/com/lightbox/Lightbox.web.tsx b/src/features/lightbox/Lightbox.web.tsx
similarity index 100%
rename from src/view/com/lightbox/Lightbox.web.tsx
rename to src/features/lightbox/Lightbox.web.tsx
diff --git a/src/features/lightbox/index.tsx b/src/features/lightbox/index.tsx
new file mode 100644
index 0000000000..ef6d5fb318
--- /dev/null
+++ b/src/features/lightbox/index.tsx
@@ -0,0 +1 @@
+export {Lightbox} from './Lightbox'
diff --git a/src/view/shell/index.tsx b/src/view/shell/index.tsx
index d15980ba4d..f613ec1d04 100644
--- a/src/view/shell/index.tsx
+++ b/src/view/shell/index.tsx
@@ -19,7 +19,6 @@ import {
   useSetDrawerOpen,
 } 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 {Deactivated} from '#/screens/Deactivated'
@@ -44,6 +43,7 @@ import {NoAccessScreen} from '#/ageAssurance/components/NoAccessScreen'
 import {RedirectOverlay} from '#/ageAssurance/components/RedirectOverlay'
 import {PassiveAnalytics} from '#/analytics/PassiveAnalytics'
 import {IS_ANDROID, IS_IOS, IS_LIQUID_GLASS} from '#/env'
+import {Lightbox} from '#/features/lightbox'
 import {RoutesContainer, TabsNavigator} from '#/Navigation'
 import {BottomSheetOutlet} from '../../../modules/bottom-sheet'
 import {updateActiveViewAsync} from '../../../modules/expo-bluesky-swiss-army/src/VisibilityView'
diff --git a/src/view/shell/index.web.tsx b/src/view/shell/index.web.tsx
index bd420ef002..d0ef14c89a 100644
--- a/src/view/shell/index.web.tsx
+++ b/src/view/shell/index.web.tsx
@@ -10,7 +10,6 @@ import {type NavigationProp} from '#/lib/routes/types'
 import {useSession} from '#/state/session'
 import {useIsDrawerOpen, useSetDrawerOpen} from '#/state/shell'
 import {useCloseAllActiveElements} 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 {Deactivated} from '#/screens/Deactivated'
@@ -34,6 +33,7 @@ import {useAgeAssurance} from '#/ageAssurance'
 import {NoAccessScreen} from '#/ageAssurance/components/NoAccessScreen'
 import {RedirectOverlay} from '#/ageAssurance/components/RedirectOverlay'
 import {PassiveAnalytics} from '#/analytics/PassiveAnalytics'
+import {Lightbox} from '#/features/lightbox'
 import {FlatNavigator, RoutesContainer} from '#/Navigation'
 import {Composer} from './Composer'
 import {DrawerContent} from './Drawer'