diff --git a/Desktop.Linux/Program.cs b/Desktop.Linux/Program.cs
index ea3cffeb..b326af32 100644
--- a/Desktop.Linux/Program.cs
+++ b/Desktop.Linux/Program.cs
@@ -43,7 +43,7 @@ namespace Remotely.Desktop.Linux
                 Conductor = Services.GetRequiredService<Conductor>();
 
                 Logger.Write("Processing Args: " + string.Join(", ", Environment.GetCommandLineArgs()));
-                Conductor.ProcessArgs(Environment.GetCommandLineArgs().SkipWhile(x => !x.StartsWith("-")).ToArray());
+                Conductor.ProcessArgs(args);
 
                 Task.Run(() =>
                 {
diff --git a/Desktop.Win/Program.cs b/Desktop.Win/Program.cs
index 3969c59d..777d7ce2 100644
--- a/Desktop.Win/Program.cs
+++ b/Desktop.Win/Program.cs
@@ -46,9 +46,7 @@ namespace Remotely.Desktop.Win
 
                 Conductor = Services.GetRequiredService<Conductor>();
                 CasterSocket = Services.GetRequiredService<CasterSocket>();
-                Conductor.ProcessArgs(Environment.GetCommandLineArgs().SkipWhile(x => !x.StartsWith("-")).ToArray());
-
-                Win32Interop.SwitchToInputDesktop();
+                Conductor.ProcessArgs(args);
 
                 if (Conductor.Mode == Core.Enums.AppMode.Chat)
                 {