diff --git a/src/servers/keystore/KeyRequestWindow.cpp b/src/servers/keystore/KeyRequestWindow.cpp
index 4d3d7a9c2c..61c7111f1f 100644
--- a/src/servers/keystore/KeyRequestWindow.cpp
+++ b/src/servers/keystore/KeyRequestWindow.cpp
@@ -121,6 +121,7 @@ public:
 		fCancelButton->SetTarget(Window());
 		fUnlockButton->SetTarget(Window());
 		fUnlockButton->MakeDefault(true);
+		fPassword->MakeFocus();
 	}
 
 	void