diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs
index 1e9edbc3..8490fa7d 100755
--- a/SparkleShare/SparkleControllerBase.cs
+++ b/SparkleShare/SparkleControllerBase.cs
@@ -622,8 +622,8 @@ namespace SparkleShare {
                 UpdateState ();
             };
 
-            repo.Initialize ();
             Repositories.Add (repo);
+            repo.Initialize ();
         }
 
 
diff --git a/SparkleShare/SparkleStatusIconController.cs b/SparkleShare/SparkleStatusIconController.cs
index e8394139..d53af998 100755
--- a/SparkleShare/SparkleStatusIconController.cs
+++ b/SparkleShare/SparkleStatusIconController.cs
@@ -50,8 +50,13 @@ namespace SparkleShare {
             get {
                 double size = 0;
 
-                foreach (SparkleRepoBase repo in Program.Controller.Repositories)
+
+                foreach (SparkleRepoBase repo in
+                         Program.Controller.Repositories.GetRange (0,
+                            Program.Controller.Repositories.Count)) {
+
                     size += repo.Size + repo.HistorySize;
+                }
 
                 return Program.Controller.FormatSize (size);
             }