diff --git a/src/app/(main)/App.tsx b/src/app/(main)/App.tsx
index e29a4a33c..6ac744aac 100644
--- a/src/app/(main)/App.tsx
+++ b/src/app/(main)/App.tsx
@@ -47,10 +47,10 @@ export function App({ children }) {
       <Row display={{ base: 'flex', lg: 'none' }} alignItems="center" gap padding="3">
         <MobileNav />
       </Row>
-      <Column display={{ base: 'none', lg: 'flex' }}>
+      <Column display={{ base: 'none', lg: 'flex' }} minHeight="0" style={{ overflow: 'hidden' }}>
         <SideNav />
       </Column>
-      <Column overflowX="hidden" position="relative">
+      <Column overflowX="hidden" minHeight="0" position="relative">
         <TopNav />
         <Column alignItems="center">{children}</Column>
       </Column>
diff --git a/src/app/(main)/SideNav.tsx b/src/app/(main)/SideNav.tsx
index ba2893bb9..6281fc900 100644
--- a/src/app/(main)/SideNav.tsx
+++ b/src/app/(main)/SideNav.tsx
@@ -54,11 +54,11 @@ export function SideNav(props: any) {
     <Column
       {...props}
       backgroundColor="surface-base"
-      justifyContent="space-between"
       border
       borderRadius
       paddingX="2"
-      height="100%"
+      flexGrow="1"
+      minHeight="0"
       margin="2"
       style={{
         width: isCollapsed ? '55px' : '240px',
@@ -66,22 +66,22 @@ export function SideNav(props: any) {
         overflow: 'hidden',
       }}
     >
-      <Column style={{ minHeight: 0, overflowY: 'auto', overflowX: 'hidden' }}>
-        <Row
-          alignItems="center"
-          justifyContent="space-between"
-          height="60px"
-          style={{ flexShrink: 0 }}
-        >
-          <Row paddingX="3" alignItems="center" justifyContent="space-between" flexGrow={1}>
-            {!isCollapsed && (
-              <IconLabel icon={<Logo />}>
-                <Text weight="bold">umami</Text>
-              </IconLabel>
-            )}
-            <PanelButton />
-          </Row>
+      <Row
+        alignItems="center"
+        justifyContent="space-between"
+        height="60px"
+        style={{ flexShrink: 0 }}
+      >
+        <Row paddingX="3" alignItems="center" justifyContent="space-between" flexGrow="1">
+          {!isCollapsed && (
+            <IconLabel icon={<Logo />}>
+              <Text weight="bold">umami</Text>
+            </IconLabel>
+          )}
+          <PanelButton />
         </Row>
+      </Row>
+      <Column flexGrow="1" minHeight="0" style={{ overflowY: 'auto', overflowX: 'hidden' }}>
         {websiteId ? (
           <WebsiteNav websiteId={websiteId} isCollapsed={isCollapsed} />
         ) : pathname.includes('/settings') ? (
@@ -117,7 +117,7 @@ export function SideNav(props: any) {
           </Column>
         )}
       </Column>
-      <Row marginBottom="4">
+      <Row marginBottom="4" style={{ flexShrink: 0 }}>
         <UserButton showText={!isCollapsed} />
       </Row>
     </Column>