diff --git a/queries/fish/indents.scm b/queries/fish/indents.scm
index 0a825a13f..526c56e69 100644
--- a/queries/fish/indents.scm
+++ b/queries/fish/indents.scm
@@ -8,9 +8,11 @@
 ] @indent.begin
 
 [
- (else_if_clause)
- (else_clause)
+ "else" ; else and else if must both start the line with "else", so tag the string directly
+ "case"
  "end"
 ] @indent.branch
 
+"end" @indent.end
+
 (comment) @indent.ignore