diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 21371c9334f1..a5d286d7f0e9 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -39,7 +39,7 @@
 | hare | ✓ |  | ✓ |  |
 | haskell | ✓ |  |  | `haskell-language-server-wrapper` |
 | hcl | ✓ |  | ✓ | `terraform-ls` |
-| heex | ✓ |  |  |  |
+| heex | ✓ | ✓ |  |  |
 | html | ✓ |  |  | `vscode-html-language-server` |
 | idris |  |  |  | `idris2-lsp` |
 | iex | ✓ |  |  |  |
diff --git a/runtime/queries/elixir/textobjects.scm b/runtime/queries/elixir/textobjects.scm
index 227a52f4e460..cc1bee990b72 100644
--- a/runtime/queries/elixir/textobjects.scm
+++ b/runtime/queries/elixir/textobjects.scm
@@ -31,3 +31,5 @@
   (arguments ((string) . (_)?))
   (do_block (_)* @test.inside)?)
  (#match? @_keyword "^(test|describe)$")) @test.around
+
+(comment) @comment.around @comment.inside
diff --git a/runtime/queries/heex/textobjects.scm b/runtime/queries/heex/textobjects.scm
new file mode 100644
index 000000000000..439f61c01a8a
--- /dev/null
+++ b/runtime/queries/heex/textobjects.scm
@@ -0,0 +1 @@
+(comment) @comment.around @comment.inside