diff --git a/lookandfeel/contents/components/KeyboardLayoutButton.qml b/lookandfeel/contents/components/KeyboardLayoutButton.qml
--- a/lookandfeel/contents/components/KeyboardLayoutButton.qml
+++ b/lookandfeel/contents/components/KeyboardLayoutButton.qml
@@ -25,6 +25,9 @@
 
 PlasmaComponents.Button {
     id: kbLayoutButton
+
+    property bool hidden : false
+
     implicitWidth: minimumWidth
     text: layout.currentLayoutDisplayName
 
@@ -34,7 +37,7 @@
         layout.nextLayout();
     }
 
-    visible: layout.layouts.length > 1
+    visible: !hidden && layout.layouts.length > 1
 
 
     KeyboardLayout {
diff --git a/lookandfeel/contents/lockscreen/MainBlock.qml b/lookandfeel/contents/lockscreen/MainBlock.qml
--- a/lookandfeel/contents/lockscreen/MainBlock.qml
+++ b/lookandfeel/contents/lockscreen/MainBlock.qml
@@ -90,7 +90,11 @@
             RowLayout {
                 anchors.horizontalCenter: parent.horizontalCenter
 
-                KeyboardLayoutButton {}
+                KeyboardLayoutButton {
+                    id: kbdLayoutButton
+                    hidden: !passwordInput.visible
+                    KeyNavigation.tab: block.mainItem
+                }
 
                 PlasmaComponents.TextField {
                     id: passwordInput
@@ -144,6 +148,7 @@
                             passwordInput.text = "";
                         }
                     }
+                    KeyNavigation.backtab: block.mainItem
                 }
 
                 PlasmaComponents.Button {
@@ -164,6 +169,7 @@
                             stackView.push(changeSessionComponent.item)
                             break;
                     }
+                    KeyNavigation.tab: kbdLayoutButton
                 }
 
                 Connections {