diff --git a/urbackupserver/www2/src/App.tsx b/urbackupserver/www2/src/App.tsx
index 6753f9c5..518ec465 100644
--- a/urbackupserver/www2/src/App.tsx
+++ b/urbackupserver/www2/src/App.tsx
@@ -159,7 +159,7 @@ const App: React.FunctionComponent = () => {
   const styles = useStackStyles();
 
   return (
-    <FluentProvider theme={selectedTheme} style={{ height: "100%" }}>
+    <FluentProvider theme={selectedTheme}>
       <React.StrictMode>
         <I18nProvider i18n={i18n}>
           <QueryClientProvider client={queryClient}>
@@ -167,12 +167,26 @@ const App: React.FunctionComponent = () => {
               <div className={styles.item}>
                 <HeaderBar />
               </div>
-              <div className={styles.itemGrow}>
-                <div className={styles.stackHorizontal}>
+              <div
+                className={styles.itemGrow}
+                style={{
+                  display: "flex",
+                  flexDirection: "column",
+                }}
+              >
+                <div
+                  className={styles.stackHorizontal}
+                  style={{
+                    flex: 1,
+                  }}
+                >
                   {snap.loggedIn && (
                     <div
                       className={styles.item}
-                      style={{ borderRight: "1px solid", padding: "10pt" }}
+                      style={{
+                        borderRight: "1px solid",
+                        padding: "10pt",
+                      }}
                     >
                       <NavSidebar />
                     </div>
diff --git a/urbackupserver/www2/src/components/StackStyles.tsx b/urbackupserver/www2/src/components/StackStyles.tsx
index abf3984d..27ea58e4 100644
--- a/urbackupserver/www2/src/components/StackStyles.tsx
+++ b/urbackupserver/www2/src/components/StackStyles.tsx
@@ -6,7 +6,7 @@ export const useStackStyles = makeStyles({
     flexDirection: "column",
     flexWrap: "nowrap",
     width: "auto",
-    height: "100%",
+    minHeight: "100vh",
     boxSizing: "border-box",
     "> *": {
       textOverflow: "ellipsis",
@@ -43,7 +43,6 @@ export const useStackStyles = makeStyles({
   itemGrow: {
     height: "auto",
     width: "auto",
-    flexShrink: 1,
-    flexGrow: 1,
+    flex: 1,
   },
 });