diff --git a/share/functions/__fish_complete_command.fish b/share/functions/__fish_complete_command.fish
index 875d72d23..5f546dc1f 100644
--- a/share/functions/__fish_complete_command.fish
+++ b/share/functions/__fish_complete_command.fish
@@ -1,5 +1,5 @@
 function __fish_complete_command --description 'Complete using all available commands'
-    set -l ctoken (commandline -ct)
+    set -l ctoken "$(commandline -ct)"
     switch $ctoken
         case '*=*'
             set ctoken (string split "=" -- $ctoken)