diff --git a/packages/cli/src/ui/hooks/useShellCompletion.ts b/packages/cli/src/ui/hooks/useShellCompletion.ts
index 2329f0d67c..23f04aee4a 100644
--- a/packages/cli/src/ui/hooks/useShellCompletion.ts
+++ b/packages/cli/src/ui/hooks/useShellCompletion.ts
@@ -432,7 +432,7 @@ export function useShellCompletion({
           .slice(0, MAX_SHELL_SUGGESTIONS)
           .map((cmd) => ({
             label: cmd,
-            value: cmd,
+            value: escapeShellPath(cmd),
             description: 'command',
           }));
       } else {