@@ -513,16 +513,15 @@ Item {
513513 }
514514
515515 function showDash() {
516− if (shell.locked) {
517− return;
518− }
519516 if (greeter.shown) {
520517 greeter.hideRight();
521518 launcher.fadeOut();
522519 }
523520
524− ApplicationManager.requestFocusApplication("unity8-dash")
525− launcher.fadeOut();
521+ if (ApplicationManager.focusedApplicationId != "unity8-dash") {
522+ ApplicationManager.requestFocusApplication("unity8-dash")
523+ launcher.fadeOut();
524+ }
526525 }
527526
528527 Item {
@@ -564,15 +563,7 @@ Item {
564563 available: edgeDemo.launcherEnabled && (!shell.locked || AccountsService.enableLauncherWhileLocked) && greeter.fakeActiveForApp === ""
565564
566565 onShowDashHome: showHome()
567− onDash: {
568− if (ApplicationManager.focusedApplicationId != "unity8-dash") {
569− showDash()
570− }
571− if (greeter.shown) {
572− launcher.fadeOut()
573− greeter.hideRight()
574− }
575− }
566+ onDash: showDash()
576567 onDashSwipeChanged: {
577568 if (dashSwipe) {
578569 dash.setCurrentScope("clickscope", false, true)