diff --git a/desktop/packages/mullvad-vpn/src/renderer/app.tsx b/desktop/packages/mullvad-vpn/src/renderer/app.tsx
index 90af0cf22fe9..b92dbd917925 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/app.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/app.tsx
@@ -293,16 +293,16 @@ export default class AppRenderer {
             <StyleSheetManager enableVendorPrefixes>
               <Lang>
                 <Router history={this.history.asHistory}>
-                  <ErrorBoundary>
-                    <ModalContainer>
-                      <KeyboardNavigation>
-                        <Theme>
+                  <Theme>
+                    <ErrorBoundary>
+                      <ModalContainer>
+                        <KeyboardNavigation>
                           <AppRouter />
-                        </Theme>
-                      </KeyboardNavigation>
-                      {window.env.platform === 'darwin' && <MacOsScrollbarDetection />}
-                    </ModalContainer>
-                  </ErrorBoundary>
+                        </KeyboardNavigation>
+                        {window.env.platform === 'darwin' && <MacOsScrollbarDetection />}
+                      </ModalContainer>
+                    </ErrorBoundary>
+                  </Theme>
                 </Router>
               </Lang>
             </StyleSheetManager>