diff --git a/packages/block-library/src/navigation/edit/index.js b/packages/block-library/src/navigation/edit/index.js
index 36002694319f80..4187938c72385e 100644
--- a/packages/block-library/src/navigation/edit/index.js
+++ b/packages/block-library/src/navigation/edit/index.js
@@ -503,7 +503,6 @@ function Navigation( {
 				<InspectorControls>
 					{ hasSubmenuIndicatorSetting && (
 						<PanelBody title={ __( 'Display' ) }>
-							<h3>{ __( 'Overlay Menu' ) }</h3>
 							{ isResponsive && (
 								<Button
 									className={ overlayMenuPreviewClasses }
@@ -531,6 +530,7 @@ function Navigation( {
 									checked={ useIcon }
 								/>
 							) }
+							<h3>{ __( 'Overlay Menu' ) }</h3>
 							<ToggleGroupControl
 								label={ __( 'Configure overlay menu' ) }
 								value={ overlayMenu }
diff --git a/packages/block-library/src/navigation/editor.scss b/packages/block-library/src/navigation/editor.scss
index ca1b76de7b8886..14db7a85b0b81c 100644
--- a/packages/block-library/src/navigation/editor.scss
+++ b/packages/block-library/src/navigation/editor.scss
@@ -578,10 +578,14 @@ body.editor-styles-wrapper
 	display: flex;
 	align-items: center;
 	width: 100%;
-	background-color: $gray-200;
-	padding: 3rem 2rem;
-	margin-bottom: 1rem;
+	background-color: $gray-100;
+	padding: 0 $grid-unit-30;
+	height: $grid-unit-40 * 2;
+	margin-bottom: $grid-unit-15;
+
 	&.open {
+		box-shadow: inset 0 0 0 $border-width $gray-200;
+		outline: 1px solid transparent; // Box shadow is removed in high contrast mode, a transparent outline is made opaque.
 		background-color: $white;
 	}
 }