diff --git a/editor/layout/style.scss b/editor/layout/style.scss
index e9bd55965acc1f..f9151c06aa3dca 100644
--- a/editor/layout/style.scss
+++ b/editor/layout/style.scss
@@ -5,11 +5,22 @@
 
 .editor-layout {
 	position: relative;
+
+	.components-notice-list {
+		position: fixed;
+		top: 100px;
+		right: auto;
+	}
+
+	.editor-meta-boxes-iframe {
+		max-width: $visual-editor-max-width;
+		margin: 10px auto 0;
+		padding: 10px 0;
+		border-top: 1px solid $light-gray-500;
+	}
 }
 
 .editor-layout__content {
-	display: flex;
-	flex-direction: column;
 	margin-top: #{ -1 * $header-height };
 
 	@include break-medium {
@@ -21,9 +32,3 @@
 	flex-basis: 100%;
 	overflow-y: auto;
 }
-
-.editor-layout .components-notice-list {
-	position: fixed;
-	top: 100px;
-	right: auto;
-}
diff --git a/editor/meta-boxes/index.js b/editor/meta-boxes/index.js
index 213ec43bbdc266..27ecd5e3eb1c6f 100644
--- a/editor/meta-boxes/index.js
+++ b/editor/meta-boxes/index.js
@@ -10,11 +10,15 @@ import MetaBoxesIframe from './meta-boxes-iframe';
 import MetaBoxesPanel from './meta-boxes-panel';
 import { getMetaBox } from '../selectors';
 
-function MetaBox( { location, isActive } ) {
+function MetaBox( { location, isActive, usePanel = false } ) {
 	if ( ! isActive ) {
 		return null;
 	}
 
+	if ( ! usePanel ) {
+		return <MetaBoxesIframe location={ location } />;
+	}
+
 	return (
 		<MetaBoxesPanel>
 			<MetaBoxesIframe location={ location } />
diff --git a/editor/modes/visual-editor/style.scss b/editor/modes/visual-editor/style.scss
index 7015c388946755..f8fc9ffe2c28b4 100644
--- a/editor/modes/visual-editor/style.scss
+++ b/editor/modes/visual-editor/style.scss
@@ -2,7 +2,7 @@
 	position: relative;
 	height: 100%;
 	margin: 0 auto;
-	padding: 50px 0;	// Floating up/down arrows invisible
+	padding: 50px 0 0;	// Floating up/down arrows invisible
 
 	&,
 	& p {
@@ -12,11 +12,11 @@
 	}
 
 	@include break-small() {
-		padding: 50px 0;
+		padding: 50px 0 0;
 	}
 
 	@include break-large() {
-		padding: 60px 0;
+		padding: 60px 0 0;
 	}
 }
 
diff --git a/editor/sidebar/post-settings/index.js b/editor/sidebar/post-settings/index.js
index b70e263583bb42..71a6aad75406e2 100644
--- a/editor/sidebar/post-settings/index.js
+++ b/editor/sidebar/post-settings/index.js
@@ -27,7 +27,7 @@ const panel = (
 		<DiscussionPanel />
 		<PageAttributes />
 		<DocumentOutlinePanel />
-		<MetaBoxes location="side" />
+		<MetaBoxes location="side" usePanel />
 	</Panel>
 );