diff --git a/SparkleLib/Git/SparkleFetcherGit.cs b/SparkleLib/Git/SparkleFetcherGit.cs
index 105f994a..e328518c 100644
--- a/SparkleLib/Git/SparkleFetcherGit.cs
+++ b/SparkleLib/Git/SparkleFetcherGit.cs
@@ -54,7 +54,7 @@ namespace SparkleLib {
                 if (server.StartsWith ("ssh://"))
                     server = server.Substring (6);
 
-                if (!server.StartsWith ("@"))
+                if (!server.Contains ("@"))
                     server = "git@" + server;
 
                 server = "ssh://" + server;
diff --git a/SparkleShare/SparkleLinController.cs b/SparkleShare/SparkleLinController.cs
index 09f616d6..8dee8963 100644
--- a/SparkleShare/SparkleLinController.cs
+++ b/SparkleShare/SparkleLinController.cs
@@ -192,16 +192,11 @@ namespace SparkleShare {
             
         public override void OpenSparkleShareFolder (string subfolder)
         {
-            string open_command_path = SparkleHelpers.CombineMore (Path.VolumeSeparatorChar.ToString (),
-                "usr", "bin", "xdg-open");
+            string folder = Path.Combine (SparklePaths.SparklePath, subfolder);
 
-            if (!File.Exists (open_command_path))
-                return;
-
-            string folder = SparkleHelpers.CombineMore (SparklePaths.SparklePath, subfolder);
             Process process = new Process ();
-            process.StartInfo.Arguments = folder.Replace (" ", "\\ "); // Escape space-characters
             process.StartInfo.FileName  = "xdg-open";
+            process.StartInfo.Arguments = "\"" + folder + "\"";
             process.Start ();
         }
     }