diff --git a/packages/e2e-test-utils-playwright/src/editor/publish-post.ts b/packages/e2e-test-utils-playwright/src/editor/publish-post.ts
index 552a0cef37233e..f036b7c626cf1f 100644
--- a/packages/e2e-test-utils-playwright/src/editor/publish-post.ts
+++ b/packages/e2e-test-utils-playwright/src/editor/publish-post.ts
@@ -11,18 +11,16 @@ import type { Editor } from './index';
  */
 export async function publishPost( this: Editor ) {
 	await this.page.click( 'role=button[name="Publish"i]' );
-	const publishEditorPanel = this.page.locator(
-		'role=region[name="Editor publish"i]'
+	const entitiesSaveButton = this.page.locator(
+		'role=region[name="Editor publish"i] >> role=button[name="Save"i]'
 	);
 
-	const isPublishEditorVisible = await publishEditorPanel.isVisible();
+	const isEntitiesSavePanelVisible = await entitiesSaveButton.isVisible();
 
 	// Save any entities.
-	if ( isPublishEditorVisible ) {
+	if ( isEntitiesSavePanelVisible ) {
 		// Handle saving entities.
-		await this.page.click(
-			'role=region[name="Editor publish"i] >> role=button[name="Save"i]'
-		);
+		await entitiesSaveButton.click();
 	}
 
 	// Handle saving just the post.
diff --git a/packages/edit-post/src/components/layout/style.scss b/packages/edit-post/src/components/layout/style.scss
index 473dae279473e9..229ab58a4e14b0 100644
--- a/packages/edit-post/src/components/layout/style.scss
+++ b/packages/edit-post/src/components/layout/style.scss
@@ -95,3 +95,7 @@
 		bottom: 0;
 	}
 }
+
+.edit-post-layout .entities-saved-states__panel-header {
+	height: $header-height + $border-width;
+}
diff --git a/packages/editor/src/components/entities-saved-states/style.scss b/packages/editor/src/components/entities-saved-states/style.scss
index aaf11c1aa9a6f9..4a2c8700245ed7 100644
--- a/packages/editor/src/components/entities-saved-states/style.scss
+++ b/packages/editor/src/components/entities-saved-states/style.scss
@@ -14,6 +14,7 @@
 }
 
 .entities-saved-states__panel-header {
+	box-sizing: border-box;
 	background: $white;
 	padding-left: $grid-unit-10;
 	padding-right: $grid-unit-10;
diff --git a/packages/interface/src/components/interface-skeleton/style.scss b/packages/interface/src/components/interface-skeleton/style.scss
index 05752e9ff32164..57d88626636dde 100644
--- a/packages/interface/src/components/interface-skeleton/style.scss
+++ b/packages/interface/src/components/interface-skeleton/style.scss
@@ -174,12 +174,26 @@ html.interface-interface-skeleton__html-container {
 	bottom: auto;
 	left: auto;
 	right: 0;
-	width: $sidebar-width;
 	color: $gray-900;
+	background: $white;
+	width: 100vw;
+
+	@include break-medium() {
+		width: $sidebar-width;
+	}
 
 	&:focus,
 	&:focus-within {
-		top: auto;
+		top: $admin-bar-height-big;
+
+		@include break-medium() {
+			border-left: $border-width solid $gray-300;
+			top: $admin-bar-height;
+
+			.is-fullscreen-mode & {
+				top: 0;
+			}
+		}
 		bottom: 0;
 	}
 }