From 875e018812ef33d54ad75ce3863c36973c174278 Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Tue, 5 Dec 2023 11:15:21 +1200
Subject: [PATCH] Fix errant scrollbar when zoomed out mode is activated

---
 .../edit-site/src/components/block-editor/editor-canvas.js  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/edit-site/src/components/block-editor/editor-canvas.js b/packages/edit-site/src/components/block-editor/editor-canvas.js
index 235eaf6617aa8f..8dfcccc4688c1e 100644
--- a/packages/edit-site/src/components/block-editor/editor-canvas.js
+++ b/packages/edit-site/src/components/block-editor/editor-canvas.js
@@ -102,7 +102,11 @@ function EditorCanvas( {
 					canvasMode === 'view'
 						? 'cursor: pointer; min-height: 100vh;'
 						: ''
-				}}}`
+				} ${
+					// In zoomed out mode, hide the normal canvas scrollbar,
+					// as this results in a double-scrollbar
+					isZoomOutMode ? 'overflow: hidden;' : ''
+				}}`
 			}</style>
 			{ children }
 		</BlockCanvas>