diff --git a/frontend/packages/app/src/App.tsx b/frontend/packages/app/src/App.tsx
index 7836f17c77..a2bb08ac53 100644
--- a/frontend/packages/app/src/App.tsx
+++ b/frontend/packages/app/src/App.tsx
@@ -36,20 +36,18 @@ const useStyles = makeStyles(theme => ({
 
 const App: FC<{}> = () => {
   return (
-    <Router>
-      <Switch>
-        <Route exact path="/">
-          <AppShell>
+    <AppShell>
+      <Router>
+        <Switch>
+          <Route exact path="/">
             <Home />
-          </AppShell>
-        </Route>
-        <Route path="/login">
-          <AppShell>
+          </Route>
+          <Route path="/login">
             <Login />
-          </AppShell>
-        </Route>
-      </Switch>
-    </Router>
+          </Route>
+        </Switch>
+      </Router>
+    </AppShell>
   );
 };