diff --git a/modules/lang/agda/config.el b/modules/lang/agda/config.el
index 97f107625..5c543fb0b 100644
--- a/modules/lang/agda/config.el
+++ b/modules/lang/agda/config.el
@@ -42,4 +42,6 @@
 ;; Tree Sitter
 (eval-when! (featurep! +tree-sitter)
   (add-hook! '(agda-mode
-               agda2-mode) #'turn-on-tree-sitter-mode))
+               agda2-mode)
+             #'turn-on-tree-sitter-mode
+             #'+tree-sitter-keys-mode))
diff --git a/modules/lang/cc/config.el b/modules/lang/cc/config.el
index 7d35a4d40..8a4ee6ff8 100644
--- a/modules/lang/cc/config.el
+++ b/modules/lang/cc/config.el
@@ -308,4 +308,6 @@ If rtags or rdm aren't available, fail silently instead of throwing a breaking e
 ;; Tree sitter
 (eval-when! (featurep! +tree-sitter)
   (add-hook! '(c-mode-hook
-               c++-mode-hook) #'turn-on-tree-sitter-mode))
+               c++-mode-hook)
+             #'turn-on-tree-sitter-mode
+             #'+tree-sitter-keys-mode))
diff --git a/modules/lang/csharp/config.el b/modules/lang/csharp/config.el
index 367169547..83ffd232d 100644
--- a/modules/lang/csharp/config.el
+++ b/modules/lang/csharp/config.el
@@ -75,4 +75,6 @@ or terminating simple string."
 
 ;; Tree sitter
 (eval-when! (featurep! +tree-sitter)
-  (add-hook! 'csharp-mode-hook #'turn-on-tree-sitter-mode))
+  (add-hook! 'csharp-mode-hook
+             #'turn-on-tree-sitter-mode
+             #'+tree-sitter-keys-mode))
diff --git a/modules/lang/elm/config.el b/modules/lang/elm/config.el
index 4a8c2697e..803a553dd 100644
--- a/modules/lang/elm/config.el
+++ b/modules/lang/elm/config.el
@@ -24,4 +24,6 @@
 
 ;; Tree sitter
 (eval-when! (featurep! +tree-sitter)
-  (add-hook! 'elm-mode-hook #'turn-on-tree-sitter-mode))
+  (add-hook! 'elm-mode-hook
+             #'turn-on-tree-sitter-mode
+             #'+tree-sitter-keys-mode))
diff --git a/modules/lang/go/config.el b/modules/lang/go/config.el
index dca231476..33c025140 100644
--- a/modules/lang/go/config.el
+++ b/modules/lang/go/config.el
@@ -79,4 +79,6 @@
 
 ;; Tree sitter
 (eval-when! (featurep! +tree-sitter)
-  (add-hook! 'go-mode-hook #'turn-on-tree-sitter-mode))
+  (add-hook! 'go-mode-hook
+             #'turn-on-tree-sitter-mode
+             #'+tree-sitter-keys-mode))
diff --git a/modules/lang/java/config.el b/modules/lang/java/config.el
index 8955bb5c1..17e6f26f6 100644
--- a/modules/lang/java/config.el
+++ b/modules/lang/java/config.el
@@ -52,4 +52,6 @@ If the depth is 2, the first two directories are removed: net.lissner.game.")
 
 ;; Tree sitter
 (eval-when! (featurep! +tree-sitter)
-  (add-hook! 'java-mode-hook #'turn-on-tree-sitter-mode))
+  (add-hook! 'java-mode-hook
+             #'turn-on-tree-sitter-mode
+             #'+tree-sitter-keys-mode))
diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el
index 6aa94a7c2..5dbc57f4f 100644
--- a/modules/lang/javascript/config.el
+++ b/modules/lang/javascript/config.el
@@ -319,4 +319,6 @@ to tide."
                js2-mode-hook
                js3-mode-hook
                typescript-mode-hook
-               rjsx-mode) #'turn-on-tree-sitter-mode))
+               rjsx-mode)
+             #'turn-on-tree-sitter-mode
+             #'+tree-sitter-keys-mode))
diff --git a/modules/lang/json/config.el b/modules/lang/json/config.el
index 303f2345a..fe5faf134 100644
--- a/modules/lang/json/config.el
+++ b/modules/lang/json/config.el
@@ -32,4 +32,6 @@
 
 (eval-when! (featurep! +tree-sitter)
   (add-hook! '(json-mode
-               jsonc-mode) #'turn-on-tree-sitter-mode))
+               jsonc-mode)
+             #'turn-on-tree-sitter-mode
+             #'+tree-sitter-keys-mode))
diff --git a/modules/lang/julia/config.el b/modules/lang/julia/config.el
index b69459f80..cf765080e 100644
--- a/modules/lang/julia/config.el
+++ b/modules/lang/julia/config.el
@@ -102,4 +102,6 @@
 
 ;; Tree sitter
 (eval-when! (featurep! +tree-sitter)
-  (add-hook! 'julia-mode-hook #'turn-on-tree-sitter-mode))
+  (add-hook! 'julia-mode-hook
+             #'turn-on-tree-sitter-mode
+             #'+tree-sitter-keys-mode))
diff --git a/modules/lang/ocaml/config.el b/modules/lang/ocaml/config.el
index 7eaaaf0e6..3d33b8675 100644
--- a/modules/lang/ocaml/config.el
+++ b/modules/lang/ocaml/config.el
@@ -121,4 +121,6 @@
 
 ;; Tree sitter
 (eval-when! (featurep! +tree-sitter)
-  (add-hook! 'tuareg-mode-hook #'turn-on-tree-sitter-mode))
+  (add-hook! 'tuareg-mode-hook
+             #'turn-on-tree-sitter-mode
+             #'+tree-sitter-keys-mode))
diff --git a/modules/lang/php/config.el b/modules/lang/php/config.el
index 406cc39fd..5278d5e07 100644
--- a/modules/lang/php/config.el
+++ b/modules/lang/php/config.el
@@ -179,4 +179,6 @@
 
 ;; Tree sitter
 (eval-when! (featurep! +tree-sitter)
-  (add-hook! #'php-mode-hook #'turn-on-tree-sitter-mode))
+  (add-hook! #'php-mode-hook
+             #'turn-on-tree-sitter-mode
+             #'+tree-sitter-keys-mode))
diff --git a/modules/lang/python/config.el b/modules/lang/python/config.el
index 2b5273a76..ad228a5ed 100644
--- a/modules/lang/python/config.el
+++ b/modules/lang/python/config.el
@@ -348,4 +348,6 @@
 
 ;; Tree sitter
 (eval-when! (featurep! +tree-sitter)
-  (add-hook! 'python-mode-hook #'turn-on-tree-sitter-mode))
+  (add-hook! 'python-mode-hook
+             #'turn-on-tree-sitter-mode
+             #'+tree-sitter-keys-mode))
diff --git a/modules/lang/ruby/config.el b/modules/lang/ruby/config.el
index 0e1121d42..57a31172e 100644
--- a/modules/lang/ruby/config.el
+++ b/modules/lang/ruby/config.el
@@ -198,4 +198,6 @@
 
 ;; Tree sitter
 (eval-when! (featurep! +tree-sitter)
-  (add-hook! 'ruby-mode-hook #'turn-on-tree-sitter-mode))
+  (add-hook! 'ruby-mode-hook
+             #'turn-on-tree-sitter-mode
+             #'+tree-sitter-keys-mode))
diff --git a/modules/lang/rust/config.el b/modules/lang/rust/config.el
index b97fb20e3..320f526b8 100644
--- a/modules/lang/rust/config.el
+++ b/modules/lang/rust/config.el
@@ -84,4 +84,6 @@
 
 ;; Tree sitter
 (eval-when! (featurep! +tree-sitter)
-  (add-hook! 'rustic-mode-hook #'turn-on-tree-sitter-mode))
+  (add-hook! 'rustic-mode-hook
+             #'turn-on-tree-sitter-mode
+             #'+tree-sitter-keys-mode))
diff --git a/modules/lang/scala/config.el b/modules/lang/scala/config.el
index 27864a264..234e7e99d 100644
--- a/modules/lang/scala/config.el
+++ b/modules/lang/scala/config.el
@@ -53,4 +53,6 @@
 
 ;; Tree sitter
 (eval-when! (featurep! +tree-sitter)
-  (add-hook! 'scala-mode-hook #'turn-on-tree-sitter-mode))
+  (add-hook! 'scala-mode-hook
+             #'turn-on-tree-sitter-mode
+             #'+tree-sitter-keys-mode))
diff --git a/modules/lang/sh/config.el b/modules/lang/sh/config.el
index a1de74ca4..b8593401b 100755
--- a/modules/lang/sh/config.el
+++ b/modules/lang/sh/config.el
@@ -96,4 +96,6 @@
 
 ;; Tree sitter
 (eval-when! (featurep! +tree-sitter)
-  (add-hook! 'sh-mode-hook #'turn-on-tree-sitter-mode))
+  (add-hook! 'sh-mode-hook
+             #'turn-on-tree-sitter-mode
+             #'+tree-sitter-keys-mode))
diff --git a/modules/lang/swift/config.el b/modules/lang/swift/config.el
index b349ec022..fbfad58b6 100644
--- a/modules/lang/swift/config.el
+++ b/modules/lang/swift/config.el
@@ -34,4 +34,6 @@
 
 ;; Tree sitter
 (eval-when! (featurep! +tree-sitter)
-  (add-hook! 'swift-mode-hook #'turn-on-tree-sitter-mode))
+  (add-hook! 'swift-mode-hook
+             #'turn-on-tree-sitter-mode
+             #'+tree-sitter-keys-mode))
diff --git a/modules/lang/web/config.el b/modules/lang/web/config.el
index a40fe6010..194a03e3e 100644
--- a/modules/lang/web/config.el
+++ b/modules/lang/web/config.el
@@ -60,4 +60,6 @@
 (eval-when! (featurep! +tree-sitter)
   (add-hook! '(html-mode-hook
                mhtml-mode-hook
-               css-mode-hook)) #'turn-on-tree-sitter-mode)
+               css-mode-hook)
+             #'turn-on-tree-sitter-mode
+             #'+tree-sitter-keys-mode))