diff --git a/SparkleShare/Mac/SparkleSetup.cs b/SparkleShare/Mac/SparkleSetup.cs
index 0564426e..a3b4048c 100755
--- a/SparkleShare/Mac/SparkleSetup.cs
+++ b/SparkleShare/Mac/SparkleSetup.cs
@@ -574,6 +574,7 @@ namespace SparkleShare {
                 Buttons.Add (ContinueButton);
                 Buttons.Add (CancelButton);
 
+                MakeFirstResponder ((NSResponder) PasswordTextField);
                 NSApplication.SharedApplication.RequestUserAttention (NSRequestUserAttentionType.CriticalRequest);
             }