diff --git a/.config/helix/languages.toml b/.config/helix/languages.toml
index e365f4e9..4b95a7ec 100644
--- a/.config/helix/languages.toml
+++ b/.config/helix/languages.toml
@@ -266,3 +266,18 @@ indent = { tab-width = 4, unit = "\t" }
 [[language]]
 name = "git-commit"
 language-servers = ["scls"]
+
+[language-server.just-lsp]
+command = "just-lsp"
+
+[[language]]
+name = "just"
+scope = "source.just"
+file-types = ["just", { glob = "justfile" }, { glob = "Justfile" }, { glob = ".justfile" }, { glob = ".Justfile" }]
+injection-regex = "just"
+comment-token = "#"
+indent = { tab-width = 4, unit = "    " }
+auto-format = true
+formatter = { command = "just", args = ["--dump"] } # Please see: https://github.com/helix-editor/helix/issues/9703
+language-servers = ["just-lsp", "scls"]
+