diff --git a/Source/GrasscutterTools/Forms/FormMain.cs b/Source/GrasscutterTools/Forms/FormMain.cs
index d5ac3e94..fe0458a5 100644
--- a/Source/GrasscutterTools/Forms/FormMain.cs
+++ b/Source/GrasscutterTools/Forms/FormMain.cs
@@ -517,10 +517,11 @@ private void AddCommandToList(string command = "")
         private void SetCommand(string command, string args)
         {
             if (!string.IsNullOrEmpty(args))
-                command = command + ' ' + args;
-            SetCommand(Settings.Default.IsIncludeUID
-                ? $"{command} @{Settings.Default.Uid}"
-                : command);
+                command = $"{command} {args}";
+            command = command.Trim();
+            if (Settings.Default.IsIncludeUID)
+                command = $"{command} @{Settings.Default.Uid}";
+            SetCommand(command);
         }
 
         /// <summary>