diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs
index 2011b54c..9abcedc5 100644
--- a/SparkleShare/SparkleController.cs
+++ b/SparkleShare/SparkleController.cs
@@ -877,6 +877,9 @@ namespace SparkleShare {
 
         public void FetchFolder (string server, string remote_folder)
         {
+            server = server.Trim ();
+            remote_folder = remote_folder.Trim ();
+
             if (!Directory.Exists (SparklePaths.SparkleTmpPath))
                 Directory.CreateDirectory (SparklePaths.SparkleTmpPath);