diff --git a/modules/config/default/+emacs-bindings.el b/modules/config/default/+emacs-bindings.el
index 469aa9852..df9c1c0c3 100644
--- a/modules/config/default/+emacs-bindings.el
+++ b/modules/config/default/+emacs-bindings.el
@@ -34,6 +34,7 @@
        :desc "Evaluate buffer/region"                "e"   #'+eval/buffer-or-region
        :desc "Evaluate & replace region"             "E"   #'+eval/region-and-replace
        :desc "Format buffer/region"                  "f"   #'+format/region-or-buffer
+       :desc "Find implementations"                  "J"   #'+lookup/implementations
        :desc "Jump to documentation"                 "k"   #'+lookup/documentation
        :desc "Send to repl"                          "s"   #'+eval/send-region-to-repl
        :desc "Delete trailing whitespace"            "w"   #'delete-trailing-whitespace
@@ -56,8 +57,7 @@
        (:when (featurep! :tools lsp +eglot)
         :desc "LSP Execute code action"              "a" #'eglot-code-actions
         :desc "LSP Rename"                           "r" #'eglot-rename
-        :desc "LSP Find declaration"                 "j" #'eglot-find-declaration
-        :desc "LSP Find implementation"              "J" #'eglot-find-implementation))
+        :desc "LSP Find declaration"                 "j" #'eglot-find-declaration))
 
       ;;; <leader> f --- file
       (:prefix-map ("f" . "file")
diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el
index bb34789af..281475af2 100644
--- a/modules/config/default/+evil-bindings.el
+++ b/modules/config/default/+evil-bindings.el
@@ -359,8 +359,7 @@
         (:when (featurep! :tools lsp +eglot)
           :desc "LSP Execute code action" "a" #'eglot-code-actions
           :desc "LSP Rename" "r" #'eglot-rename
-          :desc "LSP Find declaration" "j" #'eglot-find-declaration
-          :desc "LSP Find implementation" "J" #'eglot-find-implementation)
+          :desc "LSP Find declaration" "j" #'eglot-find-declaration)
         :desc "Compile"                               "c"   #'compile
         :desc "Recompile"                             "C"   #'recompile
         :desc "Jump to definition"                    "d"   #'+lookup/definition
@@ -368,6 +367,7 @@
         :desc "Evaluate buffer/region"                "e"   #'+eval/buffer-or-region
         :desc "Evaluate & replace region"             "E"   #'+eval:replace-region
         :desc "Format buffer/region"                  "f"   #'+format/region-or-buffer
+        :desc "Find implementations"                  "J"   #'+lookup/implementations
         :desc "Jump to documentation"                 "k"   #'+lookup/documentation
         :desc "Send to repl"                          "s"   #'+eval/send-region-to-repl
         :desc "Delete trailing whitespace"            "w"   #'delete-trailing-whitespace
diff --git a/modules/tools/lsp/+eglot.el b/modules/tools/lsp/+eglot.el
index ae37e20d4..9bb4eb92a 100644
--- a/modules/tools/lsp/+eglot.el
+++ b/modules/tools/lsp/+eglot.el
@@ -17,6 +17,8 @@
   :config
   (set-popup-rule! "^\\*eglot-help" :size 0.35 :quit t :select t)
   (set-lookup-handlers! 'eglot--managed-mode
+    :implementations #'eglot-find-implementation
+    :type-definition #'eglot-find-typeDefinition
     :documentation #'+eglot/documentation-lookup-handler)
   (when (featurep! :checkers syntax)
     (after! flycheck