diff --git a/api/js/egw_action/EgwMenuShoelace.ts b/api/js/egw_action/EgwMenuShoelace.ts
index 48fedab560..f79c23d022 100644
--- a/api/js/egw_action/EgwMenuShoelace.ts
+++ b/api/js/egw_action/EgwMenuShoelace.ts
@@ -20,6 +20,10 @@ export class EgwMenuShoelace extends LitElement
 					font-weight: var(--sl-font-weight-bold, bold);
 				}
 
+				sl-menu {
+					box-shadow: var(--sl-shadow-x-large);
+				}
+
 				sl-menu-item::part(base) {
 					height: 1.6em;
 					line-height: var(--sl-line-height-dense);
@@ -133,7 +137,8 @@ export class EgwMenuShoelace extends LitElement
 
 	handleSelect(event)
 	{
-		if(!this.popup)
+		// If not open or from a sub-menu, skip
+		if(!this.popup || event.target !== this.menu)
 		{
 			return;
 		}
diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index 9346c81f56..44d3320052 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -7144,6 +7144,9 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub
 div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl div.complex_arrow {
   background-image: url('../../api/templates/default/images/dhxmenu_subar.svg');
 }
+body > .egw_menu egw-menu-shoelace {
+  box-shadow: 0px 0px 2px 2px var(--sl-color-neutral-500);
+}
 .egwGridView_scrollarea tr.row_category > td:first-child,
 .select-cat li {
   border-left: 4px solid transparent;
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index 5c64dbd181..db63cab04b 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -7134,6 +7134,9 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub
 div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl div.complex_arrow {
   background-image: url('../../api/templates/default/images/dhxmenu_subar.svg');
 }
+body > .egw_menu egw-menu-shoelace {
+  box-shadow: 0px 0px 2px 2px var(--sl-color-neutral-500);
+}
 .egwGridView_scrollarea tr.row_category > td:first-child,
 .select-cat li {
   border-left: 4px solid transparent;
diff --git a/pixelegg/css/pixelegg.less b/pixelegg/css/pixelegg.less
index c5f946012e..7c30af9946 100644
--- a/pixelegg/css/pixelegg.less
+++ b/pixelegg/css/pixelegg.less
@@ -390,7 +390,9 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub
 div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl div.complex_arrow {
   background-image: url('../../api/templates/default/images/dhxmenu_subar.svg');
 }
-
+body > .egw_menu egw-menu-shoelace {
+  box-shadow: 0px 0px 2px 2px var(--sl-color-neutral-500);
+}
 .egwGridView_scrollarea tr.row_category > td:first-child, .select-cat li {
     border-left: 4px solid transparent;
 }
diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css
index 656904ec74..e41208cabf 100644
--- a/pixelegg/mobile/fw_mobile.css
+++ b/pixelegg/mobile/fw_mobile.css
@@ -6952,6 +6952,9 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub
 div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl div.complex_arrow {
   background-image: url('../../api/templates/default/images/dhxmenu_subar.svg');
 }
+body > .egw_menu egw-menu-shoelace {
+  box-shadow: 0px 0px 2px 2px var(--sl-color-neutral-500);
+}
 .egwGridView_scrollarea tr.row_category > td:first-child,
 .select-cat li {
   border-left: 4px solid transparent;