diff --git a/web/app/layout.tsx b/web/app/layout.tsx
index a19d5e1e57..64f0e5ac3b 100644
--- a/web/app/layout.tsx
+++ b/web/app/layout.tsx
@@ -57,38 +57,40 @@ const LocaleLayout = async ({
         <meta name="msapplication-config" content="/browserconfig.xml" />
       </head>
       <body
-        className="color-scheme h-full select-auto"
+        className="h-full select-auto"
         {...datasetMap}
       >
-        <PWAProvider>
-          <ReactScanLoader />
-          <JotaiProvider>
-            <ThemeProvider
-              attribute="data-theme"
-              defaultTheme="system"
-              enableSystem
-              disableTransitionOnChange
-              enableColorScheme={false}
-            >
-              <NuqsAdapter>
-                <BrowserInitializer>
-                  <SentryInitializer>
-                    <TanstackQueryInitializer>
-                      <I18nServerProvider>
-                        <ToastProvider>
-                          <GlobalPublicStoreProvider>
-                            {children}
-                          </GlobalPublicStoreProvider>
-                        </ToastProvider>
-                      </I18nServerProvider>
-                    </TanstackQueryInitializer>
-                  </SentryInitializer>
-                </BrowserInitializer>
-              </NuqsAdapter>
-            </ThemeProvider>
-          </JotaiProvider>
-          <RoutePrefixHandle />
-        </PWAProvider>
+        <div className="isolate h-full">
+          <PWAProvider>
+            <ReactScanLoader />
+            <JotaiProvider>
+              <ThemeProvider
+                attribute="data-theme"
+                defaultTheme="system"
+                enableSystem
+                disableTransitionOnChange
+                enableColorScheme={false}
+              >
+                <NuqsAdapter>
+                  <BrowserInitializer>
+                    <SentryInitializer>
+                      <TanstackQueryInitializer>
+                        <I18nServerProvider>
+                          <ToastProvider>
+                            <GlobalPublicStoreProvider>
+                              {children}
+                            </GlobalPublicStoreProvider>
+                          </ToastProvider>
+                        </I18nServerProvider>
+                      </TanstackQueryInitializer>
+                    </SentryInitializer>
+                  </BrowserInitializer>
+                </NuqsAdapter>
+              </ThemeProvider>
+            </JotaiProvider>
+            <RoutePrefixHandle />
+          </PWAProvider>
+        </div>
       </body>
     </html>
   )
