diff --git a/src/platform/windows/misc.cpp b/src/platform/windows/misc.cpp
index b8bf770c..cd16e178 100644
--- a/src/platform/windows/misc.cpp
+++ b/src/platform/windows/misc.cpp
@@ -753,6 +753,9 @@ namespace platf {
         // All arguments following the target
         case L'*':
           for (int i = 1; i < raw_cmd_parts.size(); i++) {
+            if (i > 1) {
+              match_replacement += L' ';
+            }
             match_replacement += raw_cmd_parts.at(i);
           }
           break;