diff --git a/queries/fish/locals.scm b/queries/fish/locals.scm
index 75d9cafa1..a522c78dc 100644
--- a/queries/fish/locals.scm
+++ b/queries/fish/locals.scm
@@ -1,5 +1,13 @@
 ;; Scopes
-(function_definition) @scope
+[
+  (command)
+  (function_definition)
+  (if_statement)
+  (for_statement)
+  (begin_statement)
+  (while_statement)
+  (switch_statement)
+] @scope
 
 ;; Definitions
 (function_definition