diff --git a/SparkleShare/Windows/SparkleSetup.cs b/SparkleShare/Windows/SparkleSetup.cs
index 301e4891..d51d69e2 100644
--- a/SparkleShare/Windows/SparkleSetup.cs
+++ b/SparkleShare/Windows/SparkleSetup.cs
@@ -557,6 +557,7 @@ namespace SparkleShare {
                     }    
 
                     case PageType.CryptoSetup: {
+                        // TODO: Merge crypto pages
                         Header      = "Set up file encryption";
                         Description = "Please a provide a strong password that you don’t use elsewhere.";
 
@@ -662,7 +663,9 @@ namespace SparkleShare {
                     
                         Buttons.Add (continue_button);
                         Buttons.Add (cancel_button);
-                        
+
+                        password_box.Focus ();
+
                         break;
                     }
                         
@@ -754,6 +757,8 @@ namespace SparkleShare {
                         
                         Buttons.Add (continue_button);
                         Buttons.Add (cancel_button);
+
+                        password_box.Focus ();
                         
                         break;
                     }