diff --git a/packages/block-editor/src/components/iframe/index.js b/packages/block-editor/src/components/iframe/index.js
index d647e46673e06..315dd813e1e2c 100644
--- a/packages/block-editor/src/components/iframe/index.js
+++ b/packages/block-editor/src/components/iframe/index.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { useState, createPortal } from '@wordpress/element';
+import { useState, createPortal, useCallback } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 
 const BODY_CLASS_NAME = 'editor-styles-wrapper';
@@ -126,16 +126,10 @@ function setHead( doc, head ) {
 		'<style>body{margin:0}</style>' + head;
 }
 
-export default function Iframe( {
-	contentRef,
-	children,
-	head,
-	style = {},
-	...props
-} ) {
+export default function Iframe( { contentRef, children, head, ...props } ) {
 	const [ iframeDocument, setIframeDocument ] = useState();
 
-	function setRef( node ) {
+	const setRef = useCallback( ( node ) => {
 		if ( ! node ) {
 			return;
 		}
@@ -159,17 +153,11 @@ export default function Iframe( {
 
 		// Document is not immediately loaded in Firefox.
 		node.addEventListener( 'load', setDocumentIfReady );
-	}
+	}, [] );
 
 	return (
 		<iframe
 			{ ...props }
-			style={ {
-				display: 'block',
-				width: '100%',
-				height: '100%',
-				...style,
-			} }
 			ref={ setRef }
 			tabIndex="0"
 			title={ __( 'Editor canvas' ) }
diff --git a/packages/e2e-tests/specs/experiments/multi-entity-editing.test.js b/packages/e2e-tests/specs/experiments/multi-entity-editing.test.js
index 914602847f027..b090ede4bd9eb 100644
--- a/packages/e2e-tests/specs/experiments/multi-entity-editing.test.js
+++ b/packages/e2e-tests/specs/experiments/multi-entity-editing.test.js
@@ -145,6 +145,11 @@ describe( 'Multi-entity editor states', () => {
 	it( 'should not dirty an entity by switching to it in the template dropdown', async () => {
 		await visitSiteEditor();
 		await clickTemplateItem( 'Template Parts', 'header' );
+		await page.waitForFunction( () =>
+			Array.from( window.frames ).find(
+				( { name } ) => name === 'editor-canvas'
+			)
+		);
 
 		// Wait for blocks to load.
 		await canvas().waitForSelector( '.wp-block' );
@@ -153,6 +158,11 @@ describe( 'Multi-entity editor states', () => {
 
 		// Switch back and make sure it is still clean.
 		await clickTemplateItem( 'Templates', 'Front Page' );
+		await page.waitForFunction( () =>
+			Array.from( window.frames ).find(
+				( { name } ) => name === 'editor-canvas'
+			)
+		);
 		await canvas().waitForSelector( '.wp-block' );
 		expect( await isEntityDirty( 'header' ) ).toBe( false );
 		expect( await isEntityDirty( 'front-page' ) ).toBe( false );
diff --git a/packages/edit-site/src/components/editor/style.scss b/packages/edit-site/src/components/editor/style.scss
index d6e9824d17d10..9cd506e94206d 100644
--- a/packages/edit-site/src/components/editor/style.scss
+++ b/packages/edit-site/src/components/editor/style.scss
@@ -20,17 +20,14 @@
 	}
 }
 
-.interface-interface-skeleton__content {
-	// The iframe is scrollable, so no need for the content area to be
-	// scrollable too.
-	overflow: visible;
-}
-
 .edit-site-visual-editor {
 	position: relative;
 	height: 100%;
 
 	iframe {
+		display: block;
+		width: 100%;
+		height: 100%;
 		background-color: $white;
 	}
 }