diff --git a/grammars.yml b/grammars.yml
index c921d505..7e9b7053 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -424,5 +424,7 @@ https://raw.githubusercontent.com/eregon/oz-tmbundle/master/Syntaxes/Oz.tmLangua
 - source.oz
 https://raw.githubusercontent.com/tenbits/sublime-mask/release/Syntaxes/mask.tmLanguage:
 - source.mask
+https://github.com/l15n/fish-tmbundle:
+- source.fish
 https://raw.githubusercontent.com/andik/IDL-Syntax/master/IDL.tmLanguage:
 - source.webidl
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 718f3aba..86105d81 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -3233,7 +3233,7 @@ fish:
   group: Shell
   extensions:
   - .fish
-  tm_scope: none
+  tm_scope: source.fish
   ace_mode: text
 
 mupad: