diff --git a/queries/markdown/highlights.scm b/queries/markdown/highlights.scm
index 473aa365e..612df57b6 100644
--- a/queries/markdown/highlights.scm
+++ b/queries/markdown/highlights.scm
@@ -1,8 +1,17 @@
 ;; From MDeiml/tree-sitter-markdown
+(atx_heading (heading_content) @text.title)
+(setext_heading (heading_content) @text.title)
+
 [
-  (atx_heading)
-  (setext_heading)
-] @text.title
+  (atx_h1_marker)
+  (atx_h2_marker)
+  (atx_h3_marker)
+  (atx_h4_marker)
+  (atx_h5_marker)
+  (atx_h6_marker)
+  (setext_h1_underline)
+  (setext_h2_underline)
+] @punctuation.special
 
 (code_fence_content) @none