diff --git a/edit-post/components/header/more-menu/index.js b/edit-post/components/header/more-menu/index.js
index 19e6feb2210b32..74327c6df032cf 100644
--- a/edit-post/components/header/more-menu/index.js
+++ b/edit-post/components/header/more-menu/index.js
@@ -3,6 +3,7 @@
  */
 import { __, _x } from '@wordpress/i18n';
 import { IconButton, Dropdown, MenuGroup } from '@wordpress/components';
+import { Fragment } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -17,6 +18,7 @@ import KeyboardShortcutsHelpMenuItem from '../keyboard-shortcuts-help-menu-item'
 const MoreMenu = () => (
 	<Dropdown
 		className="edit-post-more-menu"
+		contentClassName="edit-post-more-menu__content"
 		position="bottom left"
 		renderToggle={ ( { isOpen, onToggle } ) => (
 			<IconButton
@@ -27,7 +29,7 @@ const MoreMenu = () => (
 			/>
 		) }
 		renderContent={ ( { onClose } ) => (
-			<div className="edit-post-more-menu__content">
+			<Fragment>
 				<ModeSwitcher onSelect={ onClose } />
 				<MenuGroup
 					label={ __( 'Settings' ) }
@@ -43,7 +45,7 @@ const MoreMenu = () => (
 				>
 					<KeyboardShortcutsHelpMenuItem onSelect={ onClose } />
 				</MenuGroup>
-			</div>
+			</Fragment>
 		) }
 	/>
 );
diff --git a/edit-post/components/header/more-menu/style.scss b/edit-post/components/header/more-menu/style.scss
index e4b6478e593419..fee9a7fe0c6130 100644
--- a/edit-post/components/header/more-menu/style.scss
+++ b/edit-post/components/header/more-menu/style.scss
@@ -20,7 +20,15 @@
 	}
 }
 
-.edit-post-more-menu__content {
+.edit-post-more-menu__content .components-popover__content {
+	min-width: 260px;
+
+	// Let the menu scale to fit items.
+	@include break-mobile() {
+		width: auto;
+		max-width: $break-mobile;
+	}
+
 	.components-menu-group:not(:last-child),
 	> div:not(:last-child) .components-menu-group {
 		border-bottom: $border-width solid $light-gray-500;
diff --git a/edit-post/components/header/more-menu/test/__snapshots__/index.js.snap b/edit-post/components/header/more-menu/test/__snapshots__/index.js.snap
index b4b682a24b1fd9..8b50b89f61c230 100644
--- a/edit-post/components/header/more-menu/test/__snapshots__/index.js.snap
+++ b/edit-post/components/header/more-menu/test/__snapshots__/index.js.snap
@@ -4,6 +4,7 @@ exports[`MoreMenu should match snapshot 1`] = `
 <MoreMenu>
   <Dropdown
     className="edit-post-more-menu"
+    contentClassName="edit-post-more-menu__content"
     position="bottom left"
     renderContent={[Function]}
     renderToggle={[Function]}
diff --git a/packages/components/src/popover/style.scss b/packages/components/src/popover/style.scss
index 8d59ef572824a0..1bde0864445879 100644
--- a/packages/components/src/popover/style.scss
+++ b/packages/components/src/popover/style.scss
@@ -151,13 +151,6 @@ $arrow-size: 8px;
 		position: absolute;
 		height: auto;
 		overflow-y: auto;
-
-		// Let the menu scale to fit items.
-		min-width: 260px;
-		@include break-mobile() {
-			width: auto;
-			max-width: $break-mobile;
-		}
 	}
 
 	.components-popover:not(.is-mobile).is-top & {