diff --git a/qml/Shell.qml b/qml/Shell.qml
index ebc7cf020..e149e8caf 100644
--- a/qml/Shell.qml
+++ b/qml/Shell.qml
@@ -583,7 +583,7 @@ StyledItem {
             superPressed: physicalKeysMapper.superPressed
             superTabPressed: physicalKeysMapper.superTabPressed
             panelWidth: units.gu(settings.launcherWidth)
-            lockedVisible: (lockedByUser || shell.atDesktop) && lockAllowed
+            lockedVisible: ((lockedByUser && !greeter.locked) || shell.atDesktop) && lockAllowed
             topPanelHeight: panel.panelHeight
             drawerEnabled: !greeter.active && tutorial.launcherLongSwipeEnabled
             privateMode: greeter.active