diff --git a/src/Microsoft.PowerShell.GlobalTool.Shim/GlobalToolShim.cs b/src/Microsoft.PowerShell.GlobalTool.Shim/GlobalToolShim.cs
index c8e95628687..e75fa283d95 100644
--- a/src/Microsoft.PowerShell.GlobalTool.Shim/GlobalToolShim.cs
+++ b/src/Microsoft.PowerShell.GlobalTool.Shim/GlobalToolShim.cs
@@ -30,9 +30,10 @@ public static int Main(string[] args)
 
             string platformFolder = isWindows ? WinFolderName : UnixFolderName;
 
-            string argsString = args.Length > 0 ? string.Join(" ", args) : null;
+            var arguments = new List<string>(args.Length + 1);
             var pwshPath = Path.Combine(currentPath, platformFolder, PwshDllName);
-            string processArgs = string.IsNullOrEmpty(argsString) ? $"\"{pwshPath}\"" : $"\"{pwshPath}\" {argsString}";
+            arguments.Add(pwshPath);
+            arguments.AddRange(args);
 
             if (File.Exists(pwshPath))
             {
@@ -41,7 +42,7 @@ public static int Main(string[] args)
                     e.Cancel = true;
                 };
 
-                var process = System.Diagnostics.Process.Start("dotnet", processArgs);
+                var process = System.Diagnostics.Process.Start("dotnet", arguments);
                 process.WaitForExit();
                 return process.ExitCode;
             }