diff --git a/main.qml b/main.qml
index 1655456c..5176afb3 100644
--- a/main.qml
+++ b/main.qml
@@ -2192,6 +2192,7 @@ ApplicationWindow {
     function checkInUserActivity() {
         if(rootItem.state !== "normal") return;
         if(!persistentSettings.lockOnUserInActivity) return;
+        if(passwordDialog.visible) return;
 
         // prompt password after X seconds of inactivity
         var epoch = Math.floor((new Date).getTime() / 1000);