@@ -379,10 +379,30 @@ StyledItem {
379379 Connections {
380380 target: greeter
381381 onActiveChanged: {
382− if (!greeter.active && greeterLoader.openDrawerAfterUnlock) {
382+ if (greeter.active)
383+ return
384+
385+ // Show drawer in case showHome() requests it
386+ if (greeterLoader.openDrawerAfterUnlock) {
383387 launcher.openDrawer(false);
384388 greeterLoader.openDrawerAfterUnlock = false;
385389 }
390+ // Show the launcher when there are no running apps
391+ else if (topLevelSurfaceList.count < 1) {
392+ launcher.switchToNextState("visible")
393+ }
394+ }
395+ }
396+
397+ // Show the launcher in case there are no running apps
398+ Connections {
399+ target: topLevelSurfaceList
400+ onCountChanged: {
401+ if (topLevelSurfaceList.count > 0)
402+ return
403+
404+ stage.closeSpread()
405+ launcher.switchToNextState("visible")
386406 }
387407 }
388408 }