diff --git a/web/src/app.tsx b/web/src/app.tsx
index dc4a85938..34c0da4cf 100644
--- a/web/src/app.tsx
+++ b/web/src/app.tsx
@@ -18,6 +18,7 @@ export default function App() {
       <DrawerProvider>
         <ViewModeProvider>
           <div data-testid="app" className="w-full">
+          <AppBar />
             {!config ? (
               <div className="flex flex-grow-1 min-h-screen justify-center items-center">
                 <ActivityIndicator />
@@ -25,7 +26,6 @@ export default function App() {
             ) : (
               <div className="flex flex-row min-h-screen w-full bg-white dark:bg-gray-900 text-gray-900 dark:text-white">
                 <Sidebar />
-                <AppBar />
                 <div className="w-full flex-auto mt-16 min-w-0">
                   <Router>
                     <AsyncRoute path="/cameras/:camera/editor" getComponent={Routes.getCameraMap} />
diff --git a/web/src/components/AppBar.jsx b/web/src/components/AppBar.jsx
index 78711a45d..1003fee55 100644
--- a/web/src/components/AppBar.jsx
+++ b/web/src/components/AppBar.jsx
@@ -38,7 +38,7 @@ export default function AppBar({ title: Title, overflowRef, onOverflowClick }) {
   return (
     <div
       id="appbar"
-      className={`w-full border-b border-gray-200  dark:border-gray-700 flex items-center align-middle p-2  fixed left-0 right-0 bg-white dark:bg-gray-900 transform transition-all duration-200 ${
+      className={`w-full border-b border-gray-200  dark:border-gray-700 flex items-center align-middle p-2  fixed left-0 right-0 z-10 bg-white dark:bg-gray-900 transform transition-all duration-200 ${
         !show ? '-translate-y-full' : 'translate-y-0'
       } ${!atZero ? 'shadow-sm' : ''}`}
       data-testid="appbar"