diff --git a/packages/edit-site/src/components/layout/index.js b/packages/edit-site/src/components/layout/index.js
index a4e4fa57a5bbf..e30982c0d28c4 100644
--- a/packages/edit-site/src/components/layout/index.js
+++ b/packages/edit-site/src/components/layout/index.js
@@ -172,61 +172,61 @@ export default function Layout( { route } ) {
 
 					<EditorSnackbars />
 
-					{ isMobileViewport && areas.mobile && (
-						<div className="edit-site-layout__mobile">
-							{ canvasMode !== 'edit' && (
-								<SidebarContent routeKey={ routeKey }>
-									<SiteHubMobile
-										ref={ toggleRef }
-										isTransparent={
-											isResizableFrameOversized
-										}
-									/>
-								</SidebarContent>
+					<ErrorBoundary>
+						{ isMobileViewport && areas.mobile && (
+							<div className="edit-site-layout__mobile">
+								{ canvasMode !== 'edit' && (
+									<SidebarContent routeKey={ routeKey }>
+										<SiteHubMobile
+											ref={ toggleRef }
+											isTransparent={
+												isResizableFrameOversized
+											}
+										/>
+									</SidebarContent>
+								) }
+								{ areas.mobile }
+							</div>
+						) }
+
+						{ ! isMobileViewport &&
+							areas.content &&
+							canvasMode !== 'edit' && (
+								<div
+									className="edit-site-layout__area"
+									style={ {
+										maxWidth: widths?.content,
+									} }
+								>
+									{ areas.content }
+								</div>
 							) }
-							{ areas.mobile }
-						</div>
-					) }
 
-					{ ! isMobileViewport &&
-						areas.content &&
-						canvasMode !== 'edit' && (
+						{ ! isMobileViewport && areas.edit && (
 							<div
 								className="edit-site-layout__area"
 								style={ {
-									maxWidth: widths?.content,
+									maxWidth: widths?.edit,
 								} }
 							>
-								{ areas.content }
+								{ areas.edit }
 							</div>
 						) }
 
-					{ ! isMobileViewport && areas.edit && (
-						<div
-							className="edit-site-layout__area"
-							style={ {
-								maxWidth: widths?.edit,
-							} }
-						>
-							{ areas.edit }
-						</div>
-					) }
-
-					{ ! isMobileViewport && areas.preview && (
-						<div className="edit-site-layout__canvas-container">
-							{ canvasResizer }
-							{ !! canvasSize.width && (
-								<div
-									className={ clsx(
-										'edit-site-layout__canvas',
-										{
-											'is-right-aligned':
-												isResizableFrameOversized,
-										}
-									) }
-									ref={ animationRef }
-								>
-									<ErrorBoundary>
+						{ ! isMobileViewport && areas.preview && (
+							<div className="edit-site-layout__canvas-container">
+								{ canvasResizer }
+								{ !! canvasSize.width && (
+									<div
+										className={ clsx(
+											'edit-site-layout__canvas',
+											{
+												'is-right-aligned':
+													isResizableFrameOversized,
+											}
+										) }
+										ref={ animationRef }
+									>
 										<ResizableFrame
 											isReady={ ! isEditorLoading }
 											isFullWidth={
@@ -252,11 +252,11 @@ export default function Layout( { route } ) {
 										>
 											{ areas.preview }
 										</ResizableFrame>
-									</ErrorBoundary>
-								</div>
-							) }
-						</div>
-					) }
+									</div>
+								) }
+							</div>
+						) }
+					</ErrorBoundary>
 				</div>
 			</div>
 		</>