diff --git a/queries/latex/highlights.scm b/queries/latex/highlights.scm
index a249d04bb..9649b5dd6 100644
--- a/queries/latex/highlights.scm
+++ b/queries/latex/highlights.scm
@@ -298,15 +298,6 @@
       (_) @markup.link.url))
   (#any-of? @_name "\\url" "\\href"))
 
-[
-  (line_comment)
-  (block_comment)
-  (comment_environment)
-] @comment @spell
-
-((line_comment) @keyword.directive
-  (#lua-match? @keyword.directive "^%% !TeX"))
-
 ; File inclusion commands
 (class_include
   command: _ @keyword.import
@@ -369,3 +360,15 @@
   (displayed_equation)
   (inline_formula)
 ] @markup.math
+
+[
+  (line_comment)
+  (block_comment)
+  (comment_environment)
+] @comment @spell
+
+((line_comment) @keyword.directive
+  (#lua-match? @keyword.directive "^%% !TeX"))
+
+((line_comment) @keyword.directive
+  (#lua-match? @keyword.directive "^%%&"))
diff --git a/tests/query/highlights/latex/test.tex b/tests/query/highlights/latex/test.tex
new file mode 100644
index 000000000..9e65b900a
--- /dev/null
+++ b/tests/query/highlights/latex/test.tex
@@ -0,0 +1,33 @@
+% vim:ft=latex
+% !TeX
+% ^ @keyword.directive
+%& filename
+%  ^ @keyword.directive
+      \begin{equation} \frac{4}{2} + 128 \text{hello} \sum_{n=1}^{\text{hi\_hi\^hi}} n \end{equation}
+%                            ^ @markup.math    ^ @none             ^ @function
+
+\begin{equation} 
+  a = b % Comment here
+%         ^ @comment
+% ^ @markup.math
+\end{equation}
+\begin{equation} 
+  a = b % Comment here
+%         ^ @comment
+  b = c
+\end{equation}
+\text{
+hi $here$ is some text % with a comment
+%                        ^ @comment
+%   ^ @markup.math
+}
+\textbf{
+here is some text $5 + 2$ % with a comment
+%                           ^ @comment
+%                  ^ @markup.math
+}
+\textit{
+here is some text $5 + 2$ % with a comment
+%                           ^ @comment
+%                  ^ @markup.math
+}