diff --git a/Source/GrasscutterTools/Forms/FormMain.cs b/Source/GrasscutterTools/Forms/FormMain.cs
index f468d04..95a9265 100644
--- a/Source/GrasscutterTools/Forms/FormMain.cs
+++ b/Source/GrasscutterTools/Forms/FormMain.cs
@@ -382,7 +382,9 @@ namespace GrasscutterTools.Forms
         {
             if (!string.IsNullOrEmpty(args))
                 command = command + ' ' + args;
-            SetCommand(command.Trim() + ' ' + Settings.Default.Uid);
+            SetCommand(Settings.Default.IsIncludeUID
+                ? $"{command} @{Settings.Default.Uid}"
+                : command);
         }
 
         /// <summary>