diff --git a/packages/web/src/App.js b/packages/web/src/App.js
index 8ad18373a..c2f975e76 100644
--- a/packages/web/src/App.js
+++ b/packages/web/src/App.js
@@ -29,16 +29,16 @@ function App() {
                 <ConnectionsPinger>
                   <PluginsProvider>
                     <ExtensionsProvider>
-                      <ModalLayerProvider>
-                        <CurrentArchiveProvider>
-                          <CurrentThemeProvider>
-                            <UploadsProvider>
+                      <CurrentArchiveProvider>
+                        <CurrentThemeProvider>
+                          <UploadsProvider>
+                            <ModalLayerProvider>
                               <ThemeHelmet />
                               <Screen />
-                            </UploadsProvider>
-                          </CurrentThemeProvider>
-                        </CurrentArchiveProvider>
-                      </ModalLayerProvider>
+                            </ModalLayerProvider>
+                          </UploadsProvider>
+                        </CurrentThemeProvider>
+                      </CurrentArchiveProvider>
                     </ExtensionsProvider>
                   </PluginsProvider>
                 </ConnectionsPinger>