diff --git a/queries/gotmpl/folds.scm b/queries/gotmpl/folds.scm
new file mode 100644
index 000000000..f3a22e90c
--- /dev/null
+++ b/queries/gotmpl/folds.scm
@@ -0,0 +1,8 @@
+[
+  (if_action)
+  (range_action)
+  (block_action)
+  (with_action)
+  (define_action)
+  (comment)
+] @fold
diff --git a/queries/helm/folds.scm b/queries/helm/folds.scm
new file mode 100644
index 000000000..6ffb4b7d4
--- /dev/null
+++ b/queries/helm/folds.scm
@@ -0,0 +1 @@
+; inherits: gotmpl