diff --git a/look-and-feel/contents/lockscreen/Keypad.qml b/look-and-feel/contents/lockscreen/Keypad.qml
index d0336aae..4845716d 100644
--- a/look-and-feel/contents/lockscreen/Keypad.qml
+++ b/look-and-feel/contents/lockscreen/Keypad.qml
@@ -114,6 +114,7 @@ Rectangle {
         password: root.password
         previewCharIndex: -2
         pinLabel: qsTr("Enter PIN")
+        onPasswordChanged: keypadRoot.passwordChanged()
         
         onChangePassword: root.password = password
         Binding {
diff --git a/look-and-feel/contents/lockscreen/LockScreen.qml b/look-and-feel/contents/lockscreen/LockScreen.qml
index 2dd553ad..fddfb99c 100644
--- a/look-and-feel/contents/lockscreen/LockScreen.qml
+++ b/look-and-feel/contents/lockscreen/LockScreen.qml
@@ -278,9 +278,12 @@ PlasmaCore.ColorScope {
 
             Keypad {
                 id: keypad
-                focus: passwordFlickable.contentY === passwordFlickable.columnHeight
+                focus: true
                 swipeProgress: passwordFlickable.contentY / passwordFlickable.columnHeight
                 Layout.fillWidth: true
+                onPasswordChanged: {
+                    passwordFlickable.contentY = passwordFlickable.contentHeight - passwordFlickable.height
+                }
             }
         }
     }