diff --git a/SparkleLib/Git/SparkleGit.cs b/SparkleLib/Git/SparkleGit.cs
index c2b14930..92709c37 100644
--- a/SparkleLib/Git/SparkleGit.cs
+++ b/SparkleLib/Git/SparkleGit.cs
@@ -117,6 +117,8 @@ namespace SparkleLib.Git {
             StartInfo.WorkingDirectory       = path;
             StartInfo.CreateNoWindow         = true;
 
+            StartInfo.EnvironmentVariables.Add ("LANG", "en_US");
+
             if (string.IsNullOrEmpty (ExecPath))
                 StartInfo.Arguments = args;
             else
diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs
index 6a83f344..a076a37f 100644
--- a/SparkleLib/Git/SparkleRepoGit.cs
+++ b/SparkleLib/Git/SparkleRepoGit.cs
@@ -70,8 +70,6 @@ namespace SparkleLib.Git {
 
         public SparkleRepo (string path, SparkleConfig config) : base (path, config)
         {
-            // TODO: Set git locale to en-US
-
             SparkleGit git = new SparkleGit (LocalPath, "config core.ignorecase false");
             git.StartAndWaitForExit ();
 
diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs
index 8ea3de68..ae352df6 100644
--- a/SparkleShare/SparkleControllerBase.cs
+++ b/SparkleShare/SparkleControllerBase.cs
@@ -270,7 +270,6 @@ namespace SparkleShare {
                 new Thread (() => {
                     CheckRepositories ();
                     RepositoriesLoaded = true;
-                    FolderListChanged ();
                     UpdateState ();
 
                 }).Start ();
@@ -371,7 +370,7 @@ namespace SparkleShare {
                     else
                         previous_name = folder_name;
                 }
-                
+
                 FolderListChanged ();
             }
         }