diff --git a/gengo/languages.yaml b/gengo/languages.yaml
index b7c0649b..165a794a 100644
--- a/gengo/languages.yaml
+++ b/gengo/languages.yaml
@@ -807,12 +807,10 @@ Shell:
   matchers:
     extensions:
       - bash
-      - fish
       - sh
       - zsh
     interpreters:
       - bash
-      - fish
       - sh
       - zsh
 Solidity:
@@ -908,3 +906,11 @@ Zig:
   matchers:
     extensions:
       - zig
+fish:  # NOTE: fish is always lowercase in their documentation
+  category: programming
+  color: "#4AAE47"
+  matchers:
+    extensions:
+      - fish
+    interpreters:
+      - fish
diff --git a/samples-test/samples/fish/mkcd.fish b/samples-test/samples/fish/mkcd.fish
new file mode 100644
index 00000000..d6ce2bad
--- /dev/null
+++ b/samples-test/samples/fish/mkcd.fish
@@ -0,0 +1,4 @@
+function mkcd --wraps=mkdir --description 'Make a directory and cd into it' --argument directory
+mkdir -p $directory
+cd $directory
+end