diff --git a/qml/EntriesPage.qml b/qml/EntriesPage.qml
index 4abc7e5..5bf92d9 100644
--- a/qml/EntriesPage.qml
+++ b/qml/EntriesPage.qml
@@ -108,6 +108,7 @@ Kirigami.ScrollablePage {
                 this.entryDesc = entryType + entryName
                 this.newEntryName = entryName
             }
+            entryNameTextField.forceActiveFocus()
             this.open()
         }
     }
diff --git a/qml/PasswordDialog.qml b/qml/PasswordDialog.qml
index e84b7c5..7d85a69 100644
--- a/qml/PasswordDialog.qml
+++ b/qml/PasswordDialog.qml
@@ -74,6 +74,7 @@ BasicDialog {
         this.instruction = instruction
         clear()
         open()
+        passwordTextField.forceActiveFocus()
     }
 
     function askForExistingPassword(instruction) {