diff --git a/SparkleShare/SparklePreferencesDialog.cs b/SparkleShare/SparklePreferencesDialog.cs
index cb542860..c1f41f29 100644
--- a/SparkleShare/SparklePreferencesDialog.cs
+++ b/SparkleShare/SparklePreferencesDialog.cs
@@ -102,7 +102,6 @@ namespace SparkleShare {
 				Destroy ();
 			};
 			DialogButtons.Add (CloseButton);
-			SparkleWindow.Default = CloseButton;
 
 			LayoutVertical.PackStart (InfoLabel, false, false, 0);
 			LayoutVertical.PackStart (new Label (), false, false, 0);
diff --git a/SparkleShare/SparkleStatusIcon.cs b/SparkleShare/SparkleStatusIcon.cs
index 5562eee7..48a6de4d 100644
--- a/SparkleShare/SparkleStatusIcon.cs
+++ b/SparkleShare/SparkleStatusIcon.cs
@@ -43,6 +43,8 @@ namespace SparkleShare {
 				MenuItem [] FolderItems =
 					new MenuItem [SparkleShare.Repositories.Length];
 
+				// TODO: For some strange reason both entries
+				// open the same repo...
 				int i = 0;
 				foreach (SparkleRepo SparkleRepo in SparkleShare.Repositories) {
 					FolderItems [i] = new MenuItem (SparkleRepo.Name);