diff --git a/packages/main/src/Menu.hbs b/packages/main/src/Menu.hbs
index 7f2f39a2cd5a..8d02d28874ab 100644
--- a/packages/main/src/Menu.hbs
+++ b/packages/main/src/Menu.hbs
@@ -7,7 +7,6 @@
 	.opener={{opener}}
 	?open={{open}}
 	prevent-initial-focus
-	prevent-focus-restore
 	hide-arrow
 	allow-target-overlap
 	@ui5-before-open={{_beforePopoverOpen}}
diff --git a/packages/main/src/Menu.ts b/packages/main/src/Menu.ts
index f088575b71fc..e728228c9953 100644
--- a/packages/main/src/Menu.ts
+++ b/packages/main/src/Menu.ts
@@ -22,7 +22,6 @@ import ResponsivePopover from "./ResponsivePopover.js";
 import type { ResponsivePopoverBeforeCloseEventDetail } from "./ResponsivePopover.js";
 import Button from "./Button.js";
 import List from "./List.js";
-import Icon from "./Icon.js";
 import BusyIndicator from "./BusyIndicator.js";
 import MenuItem from "./MenuItem.js";
 import MenuSeparator from "./MenuSeparator.js";
@@ -104,7 +103,6 @@ type MenuBeforeCloseEventDetail = { escPressed: boolean };
 		List,
 		MenuItem,
 		MenuSeparator,
-		Icon,
 		BusyIndicator,
 	],
 })
@@ -387,7 +385,6 @@ class Menu extends UI5Element {
 	}
 
 	_afterPopoverOpen() {
-		this.open = true;
 		this._menuItems[0]?.focus();
 		this.fireEvent("open", {}, false, true);
 	}
diff --git a/packages/main/src/MenuItem.ts b/packages/main/src/MenuItem.ts
index eb6480c0d086..144df13062b4 100644
--- a/packages/main/src/MenuItem.ts
+++ b/packages/main/src/MenuItem.ts
@@ -189,7 +189,7 @@ class MenuItem extends ListItem implements IMenuItem {
 	}
 
 	get hasSubmenu() {
-		return !!(this.items.length || this.loading);
+		return !!(this.items.length || this.loading) && !this.disabled;
 	}
 
 	get hasEndContent() {
@@ -296,6 +296,9 @@ class MenuItem extends ListItem implements IMenuItem {
 		this.selected = false;
 		if (e.detail.escPressed) {
 			this.focus();
+			if (isPhone()) {
+				this.fireEvent("close-menu", {});
+			}
 		}
 	}
 
diff --git a/packages/main/test/pages/Menu.html b/packages/main/test/pages/Menu.html
index 751d904366a6..fc4f1b4bd80b 100644
--- a/packages/main/test/pages/Menu.html
+++ b/packages/main/test/pages/Menu.html
@@ -16,7 +16,9 @@
 	<ui5-button id="btnOpen">Open Menu</ui5-button> <br/>
 	<ui5-menu id="menu" header-text="My ui5-menu">
 		<ui5-menu-item text="New File(selection prevented)" accessible-name="Opens a file explorer" additional-text="Ctrl+Alt+Shift+N" tooltip="Select a file - prevent default" icon="add-document"></ui5-menu-item>
-		<ui5-menu-item text="New Folder with very long title for a menu item" additional-text="Ctrl+F" icon="add-folder" disabled></ui5-menu-item>
+		<ui5-menu-item text="New Folder with very long title for a menu item" additional-text="Ctrl+F" icon="add-folder" disabled>
+			<ui5-menu-item text="test.txt"></ui5-menu-item>
+		</ui5-menu-item>
 		<ui5-menu-separator></ui5-menu-separator>
 		<ui5-menu-item text="Open" icon="open-folder" accessible-name="Choose platform" loading-delay="100" loading>
 			<ui5-menu-item text="Open Locally" icon="open-folder" additional-text="Ctrl+K">
@@ -85,10 +87,12 @@
 			<ui5-button id="newFavorite" slot="endContent" icon="favorite" design="Transparent"></ui5-button>
 		</ui5-menu-item>
 		<ui5-menu-item text="New Folder with very long title for a menu item" additional-text="Ctrl+F" icon="add-folder" disabled></ui5-menu-item>
-		<ui5-menu-item text="Open" icon="open-folder" accessible-name="Choose platform" starts-section>
+		<ui5-menu-separator></ui5-menu-separator>
+		<ui5-menu-item text="Open" icon="open-folder" accessible-name="Choose platform">
 			<ui5-menu-item text="Open Locally" icon="open-folder" additional-text="Ctrl+K">
 				<ui5-menu-item text="Open from C"></ui5-menu-item>
 				<ui5-menu-item text="Open from D"></ui5-menu-item>
+				<ui5-menu-separator></ui5-menu-separator>
 				<ui5-menu-item text="Open from E" disabled></ui5-menu-item>
 			</ui5-menu-item>
 			<ui5-menu-item text="Open from SAP Cloud" additional-text="Ctrl+L"></ui5-menu-item>
@@ -102,7 +106,8 @@
 			<ui5-menu-item text="Save on Cloud" icon="upload-to-cloud"></ui5-menu-item>
 		</ui5-menu-item>
 		<ui5-menu-item text="Close" additional-text="Ctrl+W"></ui5-menu-item>
-		<ui5-menu-item text="Preferences" icon="action-settings" starts-section disabled></ui5-menu-item>
+		<ui5-menu-separator></ui5-menu-separator>
+		<ui5-menu-item text="Preferences" icon="action-settings" disabled></ui5-menu-item>
 		<ui5-menu-item text="Exit" icon="journey-arrive"></ui5-menu-item>
 	</ui5-menu>