diff --git a/packages/toolpad-app/src/components/AppEditor/index.tsx b/packages/toolpad-app/src/components/AppEditor/index.tsx
index 91c51014707..ad3c7d8d485 100644
--- a/packages/toolpad-app/src/components/AppEditor/index.tsx
+++ b/packages/toolpad-app/src/components/AppEditor/index.tsx
@@ -17,7 +17,8 @@ const classes = {
 };
 
 const EditorRoot = styled('div')(({ theme }) => ({
-  height: '100vh',
+  height: 1,
+  minHeight: '100vh',
   display: 'flex',
   flexDirection: 'column',
   overflow: 'hidden',
diff --git a/packages/toolpad-app/src/components/ToolpadShell.tsx b/packages/toolpad-app/src/components/ToolpadShell.tsx
index 4ab2c3c3fe3..5687f02a58a 100644
--- a/packages/toolpad-app/src/components/ToolpadShell.tsx
+++ b/packages/toolpad-app/src/components/ToolpadShell.tsx
@@ -9,8 +9,8 @@ export interface ToolpadShellProps {
 }
 
 const ToolpadShellRoot = styled('div')({
-  width: '100%',
-  height: '100%',
+  width: '100vw',
+  minHeight: '100vh',
   display: 'flex',
   flexDirection: 'column',
 });
diff --git a/packages/toolpad-app/src/runtime/ToolpadApp.tsx b/packages/toolpad-app/src/runtime/ToolpadApp.tsx
index e731e7b0c3d..3661e052a3e 100644
--- a/packages/toolpad-app/src/runtime/ToolpadApp.tsx
+++ b/packages/toolpad-app/src/runtime/ToolpadApp.tsx
@@ -80,6 +80,7 @@ function usePageNavigator(): NavigateToPage {
 
 const AppRoot = styled('div')({
   overflow: 'auto' /* prevents margins from collapsing into root */,
+  height: 1,
   minHeight: '100vh',
 });
 
@@ -543,8 +544,8 @@ function RenderedPage({ nodeId }: RenderedNodeProps) {
 }
 
 const FullPageCentered = styled('div')({
-  width: '100vw',
-  height: '100vh',
+  width: '100%',
+  height: '100%',
   display: 'flex',
   alignItems: 'center',
   justifyContent: 'center',