diff --git a/SparkleShare/Linux/Controller.cs b/SparkleShare/Linux/Controller.cs
index 9f92491c..aa9447b7 100644
--- a/SparkleShare/Linux/Controller.cs
+++ b/SparkleShare/Linux/Controller.cs
@@ -50,8 +50,8 @@ namespace SparkleShare {
             var gvfs_set_attribute = new Command ("gvfs-set-attribute", "\"" + Configuration.DefaultConfiguration.FoldersPath + "\" " +
                 "metadata::custom-icon-name org.sparkleshare.SparkleShare");
 
-            gvfs_set_attribute.StartInfo.EnvironmentVariables ["XDG_DATA_HOME"] =
-                Path.Combine (Config.HomePath, ".local", "share");
+            string XDG_DATA_HOME = Path.Combine (Config.HomePath, ".local", "share");
+            gvfs_set_attribute.StartInfo.EnvironmentVariables ["XDG_DATA_HOME"] = XDG_DATA_HOME;
 
             gvfs_set_attribute.StartAndWaitForExit ();
         }
diff --git a/Sparkles/Command.cs b/Sparkles/Command.cs
index 3a245922..34056cbd 100644
--- a/Sparkles/Command.cs
+++ b/Sparkles/Command.cs
@@ -52,7 +52,7 @@ namespace Sparkles {
         {
             string folder = "";
 
-            if (!string.IsNullOrEmpty (StartInfo.WorkingDirectory))
+            if (StartInfo.WorkingDirectory != Path.GetTempPath ())
                 folder = Path.GetFileName (StartInfo.WorkingDirectory) + " | ";
                 
             if (write_output)