diff --git a/packages/threat-composer/src/components/brainstorm/BrainstormBoard/index.tsx b/packages/threat-composer/src/components/brainstorm/BrainstormBoard/index.tsx
index b4ac9250..2126e8c5 100644
--- a/packages/threat-composer/src/components/brainstorm/BrainstormBoard/index.tsx
+++ b/packages/threat-composer/src/components/brainstorm/BrainstormBoard/index.tsx
@@ -243,10 +243,10 @@ const BrainstormBoardInner: FC<{ onNavigateToThreat?: NavigateToThreatHandler }>
           paddingBottom: '8px', // Space for the scrollbar
         }}>
           <div style={{
-            display: 'flex',
-            flexDirection: 'row',
+            display: 'grid',
+            gridTemplateColumns: 'repeat(auto-fill, minmax(300px, 1fr))',
             gap: '20px',
-            width: 'fit-content', // Allow container to grow based on content
+            width: '100%',
           }}>
             {columnConfig.map(column => {
               // Show assumptions and mitigations based on individual visibility
@@ -295,4 +295,4 @@ export const BrainstormBoard: FC<BrainstormBoardProps> = ({ onNavigateToThreat }
   );
 };
 
-export default BrainstormBoard;
\ No newline at end of file
+export default BrainstormBoard;