diff --git a/src/app/(main)/boards/[boardId]/BoardEditColumn.tsx b/src/app/(main)/boards/[boardId]/BoardEditColumn.tsx
index 1fddee66d..8404e9e44 100644
--- a/src/app/(main)/boards/[boardId]/BoardEditColumn.tsx
+++ b/src/app/(main)/boards/[boardId]/BoardEditColumn.tsx
@@ -100,9 +100,11 @@ export function BoardEditColumn({
         </Box>
       )}
       {renderedComponent ? (
-        <Box width="100%" height="100%" overflow="auto">
-          {renderedComponent}
-        </Box>
+        <Column width="100%" height="100%" style={{ minHeight: 0 }}>
+          <Box width="100%" flexGrow={1} overflow="auto" style={{ minHeight: 0 }}>
+            {renderedComponent}
+          </Box>
+        </Column>
       ) : (
         canEdit && (
           <Column width="100%" height="100%" alignItems="center" justifyContent="center">
diff --git a/src/app/(main)/boards/[boardId]/BoardViewColumn.tsx b/src/app/(main)/boards/[boardId]/BoardViewColumn.tsx
index 09292ae8f..3d0f5aeb9 100644
--- a/src/app/(main)/boards/[boardId]/BoardViewColumn.tsx
+++ b/src/app/(main)/boards/[boardId]/BoardViewColumn.tsx
@@ -18,8 +18,8 @@ export function BoardViewColumn({ component }: { component?: BoardComponentConfi
 
   return (
     <Panel title={title} description={description} height="100%">
-      <Column width="100%" height="100%">
-        <Box width="100%" overflow="auto">
+      <Column width="100%" height="100%" style={{ minHeight: 0 }}>
+        <Box width="100%" flexGrow={1} style={{ minHeight: 0 }}>
           <BoardComponentRenderer config={component} websiteId={websiteId} />
         </Box>
       </Column>