diff --git a/layers/+lang/java/funcs.el b/layers/+lang/java/funcs.el
index 54d62a706..70ade9862 100644
--- a/layers/+lang/java/funcs.el
+++ b/layers/+lang/java/funcs.el
@@ -68,7 +68,7 @@
 (defun spacemacs//java-setup-ensime ()
   "Setup ENSIME."
   ;; jump handler
-  (add-to-list 'spacemacs-jump-handlers 'ensime-edit-definition)
+  (add-to-list 'spacemacs-jump-handlers-java-mode 'ensime-edit-definition)
   ;; ensure the file exists before starting `ensime-mode'
   (cond
    ((and (buffer-file-name) (file-exists-p (buffer-file-name)))
diff --git a/layers/+lang/scala/funcs.el b/layers/+lang/scala/funcs.el
index aa8fa51fa..7747ff7ec 100644
--- a/layers/+lang/scala/funcs.el
+++ b/layers/+lang/scala/funcs.el
@@ -11,7 +11,8 @@
 
 (defun spacemacs//scala-setup-ensime ()
   "Setup ENSIME for Scala."
-  (spacemacs//java-setup-ensime))
+  (spacemacs//java-setup-ensime)
+  (add-to-list 'spacemacs-jump-handlers-scala-mode 'ensime-edit-definition))
 
 (defun spacemacs//scala-disable-flycheck-scala ()
   (push 'scala flycheck-disabled-checkers))