diff --git a/packages/edit-site/src/components/layout/index.js b/packages/edit-site/src/components/layout/index.js
index bd06486ff7c5b9..a216e46186336e 100644
--- a/packages/edit-site/src/components/layout/index.js
+++ b/packages/edit-site/src/components/layout/index.js
@@ -95,7 +95,9 @@ export default function Layout() {
 		( isMobileViewport && isEditorPage && canvasMode === 'edit' ) ||
 		! isMobileViewport ||
 		! isEditorPage;
-	const showFrame = ! isEditorPage || ( ! isMobileViewport && isEditorPage );
+	const showFrame =
+		( ! isEditorPage && ! isMobileViewport ) ||
+		( ! isMobileViewport && isEditorPage && canvasMode === 'view' );
 	const isFullCanvas =
 		( isMobileViewport && isListPage ) ||
 		( isEditorPage && canvasMode === 'edit' );