@@ -499,11 +499,7 @@ StyledItem {
499499 expandedPanelHeight: units.gu(7)
500500 indicatorMenuWidth: parent.width > units.gu(60) ? units.gu(40) : parent.width
501501 applicationMenuWidth: parent.width > units.gu(60) ? units.gu(40) : parent.width
502− applicationMenuContentX: {
503− if (launcher.shown) return launcher.panelWidth;
504− else if (!applicationMenus.fullyClosed) return applicationMenus.x;
505− else return 0;
506− }
502+ applicationMenuContentX: launcher.lockedVisible ? launcher.panelWidth : 0
507503
508504 indicators {
509505 hides: [launcher]
@@ -574,6 +570,11 @@ StyledItem {
574570 panel.applicationMenus.hide();
575571 }
576572 }
573+ onDrawerShownChanged: {
574+ if (drawerShown) {
575+ panel.applicationMenus.hide();
576+ }
577+ }
577578 onFocusChanged: {
578579 if (!focus) {
579580 stage.focus = true;