diff --git a/fish-config/config.fish b/fish-config/config.fish
index 3eb03d4d069fc72a61dba1e1e66f0df73d80b0fa..1ca625889c9b5e4851fa6f82f36136c28847f222 100644
--- a/fish-config/config.fish
+++ b/fish-config/config.fish
@@ -39,6 +39,11 @@ set -gx NugetMachineInstallRoot /mnt/windows_pkgs
 
 function fish_command_not_found
     # do nothing
+    echo Command not found 1>&2
+end
+
+if fish --version | grep ' 4' > /dev/null
+    bind ctrl-c cancel-commandline
 end
 
 # fundle plugin 'tuvistavie/fish-ssh-agent'