diff --git a/packages/app/src/app/app.tsx b/packages/app/src/app/app.tsx
index 1c4f8858..0afacd25 100644
--- a/packages/app/src/app/app.tsx
+++ b/packages/app/src/app/app.tsx
@@ -904,6 +904,8 @@ export default function App() {
     setCommandDraftTemplate,
     commandDraftScope,
     setCommandDraftScope,
+    commandModalError,
+    setCommandModalError,
     runModalOpen,
     runModalCommand,
     runModalDetails,
@@ -3051,7 +3053,11 @@ export default function App() {
         description={commandDraftDescription()}
         template={commandDraftTemplate()}
         scope={commandDraftScope()}
-        onClose={() => setCommandModalOpen(false)}
+        error={commandModalError()}
+        onClose={() => {
+          setCommandModalOpen(false);
+          setCommandModalError(null);
+        }}
         onSave={saveCommand}
         onNameChange={setCommandDraftName}
         onDescriptionChange={setCommandDraftDescription}
diff --git a/packages/app/src/app/command-state.ts b/packages/app/src/app/command-state.ts
index 9fc07e60..fba8f314 100644
--- a/packages/app/src/app/command-state.ts
+++ b/packages/app/src/app/command-state.ts
@@ -50,6 +50,7 @@ export function createCommandState(options: {
   const [commandDraftDescription, setCommandDraftDescription] = createSignal("");
   const [commandDraftTemplate, setCommandDraftTemplate] = createSignal("");
   const [commandDraftScope, setCommandDraftScope] = createSignal<"workspace" | "global">("workspace");
+  const [commandModalError, setCommandModalError] = createSignal<string | null>(null);
 
   const [runModalOpen, setRunModalOpen] = createSignal(false);
   const [runModalCommand, setRunModalCommand] = createSignal<WorkspaceCommand | null>(null);
@@ -93,18 +94,19 @@ export function createCommandState(options: {
     draft.template = commandDraftTemplate().trim();
 
     const safeName = sanitizeCommandName(draft.name);
+    // Use modal-specific error for validation errors
     if (!safeName || !draft.template) {
-      options.setError(t("app.error.command_name_template_required", currentLocale()));
+      setCommandModalError(t("app.error.command_name_template_required", currentLocale()));
       return;
     }
 
     if (!isTauriRuntime()) {
-      options.setError(t("app.error.workspace_commands_desktop", currentLocale()));
+      setCommandModalError(t("app.error.workspace_commands_desktop", currentLocale()));
       return;
     }
 
     if (draft.scope === "workspace" && !options.activeWorkspaceRoot().trim()) {
-      options.setError(t("app.error.pick_workspace_folder", currentLocale()));
+      setCommandModalError(t("app.error.pick_workspace_folder", currentLocale()));
       return;
     }
 
@@ -117,7 +119,7 @@ export function createCommandState(options: {
       draft.scope === "workspace" ? "status.saving_workspace_command" : "status.saving_command",
     );
     options.setBusyStartedAt(Date.now());
-    options.setError(null);
+    setCommandModalError(null);
 
     try {
       const workspaceRoot = options.activeWorkspaceRoot().trim();
@@ -162,9 +164,10 @@ export function createCommandState(options: {
 
       setJustSavedCommand({ name: safeName, scope: draft.scope });
       setCommandModalOpen(false);
+      setCommandModalError(null);
     } catch (e) {
       const message = e instanceof Error ? e.message : safeStringify(e);
-      options.setError(addOpencodeCacheHint(message));
+      setCommandModalError(addOpencodeCacheHint(message));
     } finally {
       options.setBusy(false);
       options.setBusyLabel(null);
@@ -362,6 +365,8 @@ export function createCommandState(options: {
     setCommandDraftTemplate,
     commandDraftScope,
     setCommandDraftScope,
+    commandModalError,
+    setCommandModalError,
     runModalOpen,
     runModalCommand,
     runModalDetails,
diff --git a/packages/app/src/app/components/command-modal.tsx b/packages/app/src/app/components/command-modal.tsx
index 72b77dab..2a3ef917 100644
--- a/packages/app/src/app/components/command-modal.tsx
+++ b/packages/app/src/app/components/command-modal.tsx
@@ -12,6 +12,7 @@ export type CommandModalProps = {
   description: string;
   template: string;
   scope: "workspace" | "global";
+  error?: string | null;
   onClose: () => void;
   onSave: () => void;
   onNameChange: (value: string) => void;
@@ -91,11 +92,21 @@ export default function CommandModal(props: CommandModalProps) {
               </label>
             </div>
 
-            <div class="mt-6 flex justify-end gap-2">
-              <Button variant="outline" onClick={props.onClose}>
-                {translate("common.cancel")}
-              </Button>
-              <Button onClick={props.onSave}>{translate("common.save")}</Button>
+            <div class="mt-6 flex items-center justify-between gap-2">
+              {/* Error message on the left */}
+              <div class="flex-1">
+                <Show when={props.error}>
+                  <div class="text-sm text-red-11">{props.error}</div>
+                </Show>
+              </div>
+
+              {/* Buttons on the right */}
+              <div class="flex gap-2">
+                <Button variant="outline" onClick={props.onClose}>
+                  {translate("common.cancel")}
+                </Button>
+                <Button onClick={props.onSave}>{translate("common.save")}</Button>
+              </div>
             </div>
           </div>
         </div>