diff --git a/plugins/app-visualizer/src/components/AppVisualizerPage/TreeVisualizer.tsx b/plugins/app-visualizer/src/components/AppVisualizerPage/TreeVisualizer.tsx
index 4dcbce522d..ceb6d480f2 100644
--- a/plugins/app-visualizer/src/components/AppVisualizerPage/TreeVisualizer.tsx
+++ b/plugins/app-visualizer/src/components/AppVisualizerPage/TreeVisualizer.tsx
@@ -150,10 +150,8 @@ export function TreeVisualizer() {
   return (
     <Flex
       style={{
-        flex: '1 1 0',
+        height: '100%',
         overflow: 'hidden',
-        justifyContent: 'stretch',
-        alignItems: 'stretch',
       }}
     >
       <DependencyGraph
diff --git a/plugins/app/src/extensions/components.tsx b/plugins/app/src/extensions/components.tsx
index 30f6fe3f8d..ede47a97c0 100644
--- a/plugins/app/src/extensions/components.tsx
+++ b/plugins/app/src/extensions/components.tsx
@@ -85,9 +85,17 @@ export const PageLayout = SwappableComponentBlueprint.make({
               tabs={tabs}
               customActions={headerActions}
             />
-            <Flex direction="column" style={{ flexGrow: 1, minHeight: 0 }}>
+            <main
+              style={{
+                flex: '1 1 0',
+                minHeight: 0,
+                overflow: 'auto',
+                padding: 0,
+                margin: 0,
+              }}
+            >
               {children}
-            </Flex>
+            </main>
           </Flex>
         );
       },