diff --git a/queries/htmldjango/highlights.scm b/queries/htmldjango/highlights.scm
index 5bbc4211b..a411e8f15 100644
--- a/queries/htmldjango/highlights.scm
+++ b/queries/htmldjango/highlights.scm
@@ -12,10 +12,13 @@
   (end_paired_statement)
 ] @punctuation.bracket
 
-[
-  "end"
-  (tag_name)
-] @function
+(tag_name) @function
+
+((tag_name) @keyword.conditional
+  (#any-of? @keyword.conditional "if" "elif" "else" "endif"))
+
+((tag_name) @keyword.repeat
+  (#any-of? @keyword.repeat "for" "endfor"))
 
 (variable_name) @variable