diff --git a/share/config.fish b/share/config.fish
index 06be25adb..cdbaf1d8a 100644
--- a/share/config.fish
+++ b/share/config.fish
@@ -12,7 +12,7 @@ or set -g __fish_added_user_paths
 # Create the default command_not_found handler
 #
 function __fish_default_command_not_found_handler
-    echo "fish: Unknown command '$argv'" >&2
+    printf "fish: Unknown command '%s'\n" (string escape $argv) >&2
 end
 
 if status --is-interactive