diff --git a/SparkleShare/SparkleSetup.cs b/SparkleShare/SparkleSetup.cs
index 1c0f44e6..b4721915 100755
--- a/SparkleShare/SparkleSetup.cs
+++ b/SparkleShare/SparkleSetup.cs
@@ -327,7 +327,7 @@ namespace SparkleShare {
                             Button cancel_button = new Button (_("Cancel"));
 
                             cancel_button.Clicked += delegate {
-                                Close ();
+                                Controller.PageCancelled ();
                             };
 
                             // Sync button
@@ -477,7 +477,6 @@ namespace SparkleShare {
 
                         finish_button.Clicked += delegate {
                             Controller.FinishedPageCompleted ();
-                            Close ();
                         };
 
 
@@ -592,7 +591,7 @@ namespace SparkleShare {
 
                             Button finish_button = new Button (_("Finish"));
                             finish_button.Clicked += delegate {
-                                Close ();
+                                Controller.FinishPageCompleted ();
                             };
 
 
diff --git a/SparkleShare/SparkleSetupWindow.cs b/SparkleShare/SparkleSetupWindow.cs
index 3ef464c8..45ef6a41 100755
--- a/SparkleShare/SparkleSetupWindow.cs
+++ b/SparkleShare/SparkleSetupWindow.cs
@@ -50,11 +50,6 @@ namespace SparkleShare {
 
             SetSizeRequest (680, 440);
 
-            DeleteEvent += delegate (object o, DeleteEventArgs args) {
-                args.RetVal = true;
-                Close ();
-            };
-
             HBox = new HBox (false, 6);
 
                 VBox = new VBox (false, 0);
@@ -147,10 +142,5 @@ namespace SparkleShare {
             Present ();
             base.ShowAll ();
         }
-
-        public void Close ()
-        {
-            HideAll ();
-        }
     }
 }