diff --git a/modules/feature/file-templates/config.el b/modules/feature/file-templates/config.el
index b8d6fcf10..fe4fb4ff6 100644
--- a/modules/feature/file-templates/config.el
+++ b/modules/feature/file-templates/config.el
@@ -110,5 +110,5 @@
           ("/\\(index\\|main\\)\\.slim$"     "__"               slim-mode)
           ;; Shell scripts
           ("\\.z?sh$"                        "__"               sh-mode)
+          ("\\.fish$"                        "__"               fish-mode)
           ("\\.zunit$"                       "__zunit"          sh-mode))))
-
diff --git a/modules/feature/file-templates/templates/fish-mode/__ b/modules/feature/file-templates/templates/fish-mode/__
new file mode 100644
index 000000000..a4ef95db3
--- /dev/null
+++ b/modules/feature/file-templates/templates/fish-mode/__
@@ -0,0 +1,3 @@
+#!/usr/bin/env fish
+
+$0