diff --git a/.gitmodules b/.gitmodules
index 5c6f22cd814d..bf596bdc1cc4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -134,6 +134,10 @@
 	path = helix-syntax/languages/tree-sitter-cmake
 	url = https://github.com/uyha/tree-sitter-cmake
 	shallow = true
+[submodule "helix-syntax/languages/tree-sitter-glsl"]
+	path = helix-syntax/languages/tree-sitter-glsl
+	url = https://github.com/theHamsta/tree-sitter-glsl.git
+	shallow = true
 [submodule "helix-syntax/languages/tree-sitter-perl"]
 	path = helix-syntax/languages/tree-sitter-perl
 	url = https://github.com/ganezdragon/tree-sitter-perl
diff --git a/helix-syntax/languages/tree-sitter-glsl b/helix-syntax/languages/tree-sitter-glsl
new file mode 160000
index 000000000000..88408ffc5e27
--- /dev/null
+++ b/helix-syntax/languages/tree-sitter-glsl
@@ -0,0 +1 @@
+Subproject commit 88408ffc5e27abcffced7010fc77396ae3636d7e
diff --git a/languages.toml b/languages.toml
index 067138e4cf5e..45fc2ab26a07 100644
--- a/languages.toml
+++ b/languages.toml
@@ -401,6 +401,14 @@ comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
 language-server = { command = "cmake-language-server" }
 
+[[language]]
+name = "glsl"
+scope = "source.glsl"
+file-types = ["glsl", "vert", "tesc", "tese", "geom", "frag", "comp" ]
+roots = []
+comment-token = "//"
+indent = { tab-width = 4, unit = "    " }
+
 [[language]]
 name = "perl"
 scope = "source.perl"
diff --git a/runtime/queries/glsl/folds.scm b/runtime/queries/glsl/folds.scm
new file mode 100644
index 000000000000..a5a5208ca9c7
--- /dev/null
+++ b/runtime/queries/glsl/folds.scm
@@ -0,0 +1 @@
+; inherits: c
diff --git a/runtime/queries/glsl/highlights.scm b/runtime/queries/glsl/highlights.scm
new file mode 100644
index 000000000000..af2a049fb5ac
--- /dev/null
+++ b/runtime/queries/glsl/highlights.scm
@@ -0,0 +1,37 @@
+; inherits: c
+
+[
+  "in"
+  "out"
+  "inout"
+  "uniform"
+  "shared"
+  "layout"
+  "attribute"
+  "varying"
+  "buffer"
+  "coherent"
+  "readonly"
+  "writeonly"
+  "precision"
+  "highp"
+  "mediump"
+  "lowp"
+  "centroid"
+  "sample"
+  "patch"
+  "smooth"
+  "flat"
+  "noperspective"
+  "invariant"
+  "precise"
+] @keyword
+
+"subroutine" @keyword.function
+
+(extension_storage_class) @attribute
+
+(
+  (identifier) @variable.builtin
+  (#match? @variable.builtin "^gl_")
+)
diff --git a/runtime/queries/glsl/indents.toml b/runtime/queries/glsl/indents.toml
new file mode 100644
index 000000000000..a7fd499a9239
--- /dev/null
+++ b/runtime/queries/glsl/indents.toml
@@ -0,0 +1,19 @@
+indent = [
+  "init_declarator",
+  "compound_statement",
+  "preproc_arg",
+  "field_declaration_list",
+  "case_statement",
+  "conditional_expression",
+  "enumerator_list",
+  "struct_specifier",
+  "compound_literal_expression"
+]
+
+outdent = [
+  "#define",
+  "#ifdef",
+  "#endif",
+  "{",
+  "}"
+]
diff --git a/runtime/queries/glsl/injections.scm b/runtime/queries/glsl/injections.scm
new file mode 100644
index 000000000000..7d3323b16451
--- /dev/null
+++ b/runtime/queries/glsl/injections.scm
@@ -0,0 +1,3 @@
+(preproc_arg) @glsl
+
+(comment) @comment
diff --git a/runtime/queries/glsl/locals.scm b/runtime/queries/glsl/locals.scm
new file mode 100644
index 000000000000..a5a5208ca9c7
--- /dev/null
+++ b/runtime/queries/glsl/locals.scm
@@ -0,0 +1 @@
+; inherits: c