diff --git a/SparkleShare/Mac/SparkleSetupWindow.cs b/SparkleShare/Mac/SparkleSetupWindow.cs
index 1da66c27..58d2bc67 100755
--- a/SparkleShare/Mac/SparkleSetupWindow.cs
+++ b/SparkleShare/Mac/SparkleSetupWindow.cs
@@ -129,6 +129,8 @@ namespace SparkleShare {
                     i++;
                 }
             }
+
+            RecalculateKeyViewLoop ();
         }
 
 
@@ -145,5 +147,11 @@ namespace SparkleShare {
             NSApplication.SharedApplication.RemoveWindowsItem (this);
             return;
         }
+
+
+        public override bool AcceptsFirstResponder ()
+        {
+            return true;
+        }
     }
 }