diff --git a/.config/kak-tree-sitter/config.toml b/.config/kak-tree-sitter/config.toml
index b429777e..e020264b 100644
--- a/.config/kak-tree-sitter/config.toml
+++ b/.config/kak-tree-sitter/config.toml
@@ -145,8 +145,8 @@ pin = "7275b7f85014aad7e15d4987ec4f2249572eecfb"
 [language.ini.queries]
 path = "runtime/queries/ini"
 
-[language.just]
-aliases = ["justfile"]
+# [language.just]
+# aliases = ["justfile"]
 
 [grammar.just.source.git]
 url = "https://github.com/poliorcetics/tree-sitter-just"
diff --git a/.config/kak/autoload/filetype/just.kak b/.config/kak/autoload/filetype/just.kak
index 5757aee1..6c50a5d5 100644
--- a/.config/kak/autoload/filetype/just.kak
+++ b/.config/kak/autoload/filetype/just.kak
@@ -5,9 +5,9 @@ hook global BufCreate .*/?[jJ]ustfile %{
     set-option buffer filetype justfile
 }
 
-hook global WinSetOption tree_sitter_lang=justfile %{
-    set-option window tree_sitter_lang just
-}
+# hook global WinSetOption tree_sitter_lang=justfile %{
+#     set-option window tree_sitter_lang just
+# }
 
 hook global WinSetOption filetype=justfile %{
     require-module justfile
diff --git a/.config/kak/autoload/lsp.kak b/.config/kak/autoload/lsp.kak
index e799f2c5..9f5f9ba4 100644
--- a/.config/kak/autoload/lsp.kak
+++ b/.config/kak/autoload/lsp.kak
@@ -61,7 +61,6 @@ define-command -override lsp-progress-enable %{
 
 # mappings
 map global user k ': lsp-hover<ret>' -docstring 'LSP hover'
-map global user l ': enter-user-mode lsp<ret>' -docstring 'LSP mode'
 map global lsp L ': lsp-code-lens<ret>'
 
 map global insert <tab> '<a-;>:try lsp-snippets-select-next-placeholders catch %{ execute-keys -with-hooks <lt>tab> }<ret>' -docstring 'Select next snippet placeholder'
@@ -166,12 +165,17 @@ define-command lsp-on %{
 		trigger-user-hook lsp-enabled
 }
 
+define-command lsp-enter %{
+    try %{ lsp-on }
+    enter-user-mode lsp
+}
+
 define-command lsp-off %{
     lsp-disable-window
 }
 
-map -docstring 'lsp on' global lsp l ': lsp-on<ret>'
-map -docstring 'lsp off' global lsp <a-l> ': lsp-off<ret>'
+map global user l ': lsp-enter<ret>' -docstring 'LSP'
+map -docstring 'lsp off' global user <a-l> ': try lsp-off<ret>'
 
 define-command -hidden lsp-filetype-hooks-update %{
 	try %{ remove-hooks global lsp-filetypes }