diff --git a/quickshell/modules/launcher/AppLauncher.qml b/quickshell/modules/launcher/AppLauncher.qml
index 86c32eb..ebf7db1 100644
--- a/quickshell/modules/launcher/AppLauncher.qml
+++ b/quickshell/modules/launcher/AppLauncher.qml
@@ -18,7 +18,7 @@ PanelWindow {
     WlrLayershell.layer: WlrLayershell.Overlay
     WlrLayershell.keyboardFocus: WlrLayershell.Exclusive
 
-    visible: PopupService.appLauncherOpen
+    visible: PopupService.appLauncherOpen && !LockscreenService.isLocked
 
     // Currently highlighted app index for keyboard navigation
     property int selectedIndex: 0
diff --git a/quickshell/services/LockscreenService.qml b/quickshell/services/LockscreenService.qml
index d762c92..fc69890 100644
--- a/quickshell/services/LockscreenService.qml
+++ b/quickshell/services/LockscreenService.qml
@@ -66,6 +66,7 @@ Item {
     }
 
     function lock() {
+        PopupService.closeAll()
         userPassword = ""
         typedCount = 0
         authFailed = false
diff --git a/quickshell/services/PopupService.qml b/quickshell/services/PopupService.qml
index 539c661..776cfc5 100644
--- a/quickshell/services/PopupService.qml
+++ b/quickshell/services/PopupService.qml
@@ -133,6 +133,7 @@ Item {
     }
 
     function toggleAppLauncher() {
+        if (LockscreenService.isLocked) return;
         let state = !appLauncherOpen
         closeAll()
         appLauncherOpen = state