diff --git a/rc/fish.kak b/rc/fish.kak
index f0e2fd8e..48607b20 100644
--- a/rc/fish.kak
+++ b/rc/fish.kak
@@ -27,8 +27,8 @@ addhl -group /fish/comment       fill comment
 
 addhl -group /fish/code regex (\$\w+)|(\{\$\w+\}) 0:identifier
 
-# Command names generated by fish
-addhl -group /fish/code regex %sh{ printf '\<(%s)\>' $(printf '\Q%s\\E|' $(fish --command 'builtin --names' --command 'functions --names' | tr --delete ,)) } 0:keyword
+# Command names are collected using `builtin --names` and 'eval' from `functions --names`
+addhl -group /fish/code regex \<(and|begin|bg|bind|block|break|breakpoint|builtin|case|cd|command|commandline|complete|contains|continue|count|echo|else|emit|end|eval|exec|exit|fg|for|function|functions|history|if|jobs|not|or|printf|pwd|random|read|return|set|set_color|source|status|switch|test|ulimit|while)\> 0:keyword
 
 # Commands
 # ‾‾‾‾‾‾‾‾