diff --git a/src/KeyKeeper/Views/RepositoryWindow.axaml b/src/KeyKeeper/Views/RepositoryWindow.axaml
index 126c690..a8317dd 100644
--- a/src/KeyKeeper/Views/RepositoryWindow.axaml
+++ b/src/KeyKeeper/Views/RepositoryWindow.axaml
@@ -153,7 +153,8 @@
         <TextBox x:Name="UnlockPasswordEdit"
                          Text="{Binding UnlockPassword, Mode=TwoWay}"
                          PasswordChar="*"
-                         Width="450" />
+                         Width="450"
+                         Loaded="UnlockPasswordEdit_Loaded" />
 
         <Button x:Name="UnlockButton"
                         Command="{Binding TryUnlock}"
diff --git a/src/KeyKeeper/Views/RepositoryWindow.axaml.cs b/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
index 6e39894..13280a0 100644
--- a/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
+++ b/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
@@ -39,6 +39,11 @@ public partial class RepositoryWindow : Window
             vm.ResetLockTimer();
     }
 
+    private void UnlockPasswordEdit_Loaded(object? sender, RoutedEventArgs e)
+    {
+        (sender as TextBox)?.Focus();
+    }
+
     private async void RepositoryWindow_Closing(object? sender, WindowClosingEventArgs e)
     {
         if (allowClose || closeConfirmationShown)