@@ -132,7 +132,7 @@ StyledItem {
133 panel.indicators.hide();
133 panel.indicators.hide();
134 launcher.hide(launcher.ignoreHideIfMouseOverLauncher);
134 launcher.hide(launcher.ignoreHideIfMouseOverLauncher);
135− } else if (topLevelSurfaceList.count === 0 && !greeter.active && !wizard.active) {
135+ } else if (topLevelSurfaceList.count === 0 && greeter && !greeter.active && !wizard.active) {
136 // Show the Launcher when there are no apps running
136 // Show the Launcher when there are no apps running
137 stage.closeSpread();
137 stage.closeSpread();
138 launcher.show();
138 launcher.show();
@@ -403,8 +403,9 @@ StyledItem {
403 launcher.toggleDrawer(false);
403 launcher.toggleDrawer(false);
404 greeterLoader.toggleDrawerAfterUnlock = false;
404 greeterLoader.toggleDrawerAfterUnlock = false;
406− // Show the launcher when there are no running apps
406+ // Show the launcher when there are no running apps and the user
407+ // isn't operating the panel
407− else if (topLevelSurfaceList.count < 1) {
408+ else if (topLevelSurfaceList.count < 1 && !panel.visible) {
408 launcher.switchToNextState("visible")
409 launcher.switchToNextState("visible")