diff --git a/fish_completions.go b/fish_completions.go
index 12d61b6911..1b5390d00b 100644
--- a/fish_completions.go
+++ b/fish_completions.go
@@ -45,7 +45,7 @@ function __%[1]s_perform_completion
     __%[1]s_debug "Starting __%[1]s_perform_completion"
 
     # Extract all args except the last one
-    set -l args (commandline -opc)
+    set -l args (commandline -opc | string escape)
     # Extract the last arg and escape it in case it is a space
     set -l lastArg (string escape -- (commandline -ct))