diff --git a/packages/stack-server/src/app/(main)/handler/[...stack]/layout.tsx b/packages/stack-server/src/app/(main)/handler/[...stack]/layout.tsx
index 294b83b8a..1ef3c217e 100644
--- a/packages/stack-server/src/app/(main)/handler/[...stack]/layout.tsx
+++ b/packages/stack-server/src/app/(main)/handler/[...stack]/layout.tsx
@@ -5,9 +5,9 @@ import { Box, Stack } from '@mui/joy';
 export default function Layout(props: { children: React.ReactNode }) {
   const headerHeight = 50;
   return (
-    <Stack direction="column" height='100vh' overflow='hidden'>
+    <Stack direction="column" height='100vh'>
       <Header headerHeight={headerHeight} />
-      <Box height={'100%'} overflow='auto'>
+      <Box flexGrow={1}>
         {props.children}
       </Box>
     </Stack>
diff --git a/packages/stack-server/src/components/header.tsx b/packages/stack-server/src/components/header.tsx
index ef3fb314e..3c7d200af 100644
--- a/packages/stack-server/src/components/header.tsx
+++ b/packages/stack-server/src/components/header.tsx
@@ -1,35 +1,37 @@
 "use client";
 import { Logo } from "@/components/logo";
-import { Sheet, SheetProps, Stack } from "@mui/joy";
+import { Box, Sheet, SheetProps, Stack } from "@mui/joy";
 import { UserButton } from "@stackframe/stack";
 
 export function Header(props: SheetProps & { headerHeight: number }) {
   const { headerHeight, ...sheetProps } = props;
 
   return (
-    <Sheet
-      variant="outlined"
-      component="header"
-      {...sheetProps}
-      sx={{
-        paddingX: 1,
-        position: 'sticky',
-        top: 0,
-        zIndex: 30,
-        borderTop: 'none',
-        borderLeft: 'none',
-        borderRight: 'none',
-        display: 'flex',
-        alignItems: 'stretch',
-        justifyContent: 'space-between',
-        height: `${headerHeight}px`,
-        ...(sheetProps.sx ?? {}),
-      }}
-    >
-      <Stack sx={{ marginLeft: 2, justifyContent: 'center', height: headerHeight - 1 }}>
-        <Logo full height={24} href="/projects" />
-      </Stack>
-      <UserButton />
-    </Sheet>
+    <>
+      <Sheet
+        variant="outlined"
+        component="header"
+        {...sheetProps}
+        sx={{
+          paddingX: 1,
+          position: 'sticky',
+          top: 0,
+          zIndex: 30,
+          borderTop: 'none',
+          borderLeft: 'none',
+          borderRight: 'none',
+          display: 'flex',
+          alignItems: 'stretch',
+          justifyContent: 'space-between',
+          height: `${headerHeight}px`,
+          ...(sheetProps.sx ?? {}),
+        }}
+      >
+        <Stack sx={{ marginLeft: 2, justifyContent: 'center', height: headerHeight - 1 }}>
+          <Logo full height={24} href="/projects" />
+        </Stack>
+        <UserButton />
+      </Sheet>
+    </>
   );
 }