diff --git a/SparkleShare/Common/SparkleShare.cs b/SparkleShare/Common/SparkleShare.cs
index 122dca27..7d452168 100644
--- a/SparkleShare/Common/SparkleShare.cs
+++ b/SparkleShare/Common/SparkleShare.cs
@@ -26,7 +26,6 @@ namespace SparkleShare {
 
         public static Controller Controller;
         public static UserInterface UI;
-        public static string [] Arguments;
 
         static Mutex program_mutex = new Mutex (false, "SparkleShare");
         
@@ -36,8 +35,6 @@ namespace SparkleShare {
         #endif
         public static void Main (string [] args)
         {
-            Arguments = args;
-
             if (args.Length != 0 && (args [0].Equals ("help") || args [0].Equals ("version")) &&
                 InstallationInfo.OperatingSystem != OS.Mac &&
                 InstallationInfo.OperatingSystem != OS.Windows) {
@@ -69,7 +66,7 @@ namespace SparkleShare {
             Controller.Initialize ();
 
             UI = new UserInterface ();
-            UI.Run ();
+            UI.Run (args);
 
             #if !__MonoCS__
             // Suppress assertion messages in debug mode
diff --git a/SparkleShare/Mac/UserInterface/UserInterface.cs b/SparkleShare/Mac/UserInterface/UserInterface.cs
index 81ce11ea..64a2f737 100755
--- a/SparkleShare/Mac/UserInterface/UserInterface.cs
+++ b/SparkleShare/Mac/UserInterface/UserInterface.cs
@@ -49,9 +49,9 @@ namespace SparkleShare {
         }
 
 
-        public void Run ()
+        public void Run (string [] args)
         {
-            NSApplication.Main (SparkleShare.Arguments);
+            NSApplication.Main (args);
         }