diff --git a/Modules/Lock/LockScreenContent.qml b/Modules/Lock/LockScreenContent.qml
index bf5568e7..37c62070 100644
--- a/Modules/Lock/LockScreenContent.qml
+++ b/Modules/Lock/LockScreenContent.qml
@@ -322,7 +322,7 @@ Item {
                             }
                         }
                         onAccepted: {
-                            if (!demoMode && root.passwordBuffer.length > 0 && !pam.active) {
+                            if (!demoMode && !pam.active) {
                                 console.log("Enter pressed, starting PAM authentication")
                                 pam.start()
                             }
@@ -350,6 +350,18 @@ Item {
                                 forceActiveFocus()
                             }
                         }
+
+                        onActiveFocusChanged: {
+                            if (!activeFocus && !demoMode && visible) {
+                                Qt.callLater(() => forceActiveFocus())
+                            }
+                        }
+
+                        onEnabledChanged: {
+                            if (enabled && !demoMode && visible) {
+                                Qt.callLater(() => forceActiveFocus())
+                            }
+                        }
                     }
 
                     KeyboardController {
@@ -546,7 +558,7 @@ Item {
                         anchors.verticalCenter: parent.verticalCenter
                         iconName: "keyboard_return"
                         buttonSize: 36
-                        visible: (demoMode || (root.passwordBuffer.length > 0 && !pam.active && !root.unlocking))
+                        visible: (demoMode || (!pam.active && !root.unlocking))
                         enabled: !demoMode
                         onClicked: {
                             if (!demoMode) {