From 0e1960792169689825999047863b45a2cb9f04d1 Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Fri, 21 Oct 2022 12:20:31 +0800
Subject: [PATCH 1/3] Fix resizeable editor scrolling by avoiding setting a
 height on the editor iframe

---
 .../edit-site/src/components/block-editor/resizable-editor.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/edit-site/src/components/block-editor/resizable-editor.js b/packages/edit-site/src/components/block-editor/resizable-editor.js
index 2e76b5a2a1e98..32bad6c3c0958 100644
--- a/packages/edit-site/src/components/block-editor/resizable-editor.js
+++ b/packages/edit-site/src/components/block-editor/resizable-editor.js
@@ -141,7 +141,7 @@ function ResizableEditor( { enableResizing, settings, children, ...props } ) {
 		>
 			<Iframe
 				isZoomedOut={ isZoomOutMode }
-				style={ enableResizing ? { height } : deviceStyles }
+				style={ enableResizing ? undefined : deviceStyles }
 				head={
 					<>
 						<EditorStyles styles={ settings.styles } />

From 4f0c0ab2b3c5d6450920394ddd6be929ef515b09 Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Fri, 21 Oct 2022 12:51:04 +0800
Subject: [PATCH 2/3] Revert "Fix resizeable editor scrolling by avoiding
 setting a height on the editor iframe"

This reverts commit 0e1960792169689825999047863b45a2cb9f04d1.
---
 .../edit-site/src/components/block-editor/resizable-editor.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/edit-site/src/components/block-editor/resizable-editor.js b/packages/edit-site/src/components/block-editor/resizable-editor.js
index 32bad6c3c0958..2e76b5a2a1e98 100644
--- a/packages/edit-site/src/components/block-editor/resizable-editor.js
+++ b/packages/edit-site/src/components/block-editor/resizable-editor.js
@@ -141,7 +141,7 @@ function ResizableEditor( { enableResizing, settings, children, ...props } ) {
 		>
 			<Iframe
 				isZoomedOut={ isZoomOutMode }
-				style={ enableResizing ? undefined : deviceStyles }
+				style={ enableResizing ? { height } : deviceStyles }
 				head={
 					<>
 						<EditorStyles styles={ settings.styles } />

From b48f13b07d1c4a6bdcb8a0c751fdcffeb5e81773 Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Fri, 21 Oct 2022 12:52:15 +0800
Subject: [PATCH 3/3] Set a max height instead of removing height from the
 iframe totally

---
 packages/edit-site/src/components/block-editor/style.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/edit-site/src/components/block-editor/style.scss b/packages/edit-site/src/components/block-editor/style.scss
index 9830f1e302eac..6f7e27f8a1cc2 100644
--- a/packages/edit-site/src/components/block-editor/style.scss
+++ b/packages/edit-site/src/components/block-editor/style.scss
@@ -23,6 +23,7 @@
 
 		.edit-site-visual-editor__editor-canvas {
 			border-radius: $radius-block-ui;
+			max-height: 100%;
 		}
 
 		// To hide the horizontal scrollbar and show the drag handle on the