diff --git a/core/core-editor.el b/core/core-editor.el
index fc349f75e..f47276edd 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -197,6 +197,7 @@ savehist file."
   :init
   (global-set-key [remap evil-jump-forward]  #'better-jumper-jump-forward)
   (global-set-key [remap evil-jump-backward] #'better-jumper-jump-backward)
+  (global-set-key [remap xref-pop-marker-stack] #'better-jumper-jump-backward)
   :config
   (better-jumper-mode +1)
   (add-hook 'better-jumper-post-jump-hook #'recenter)
diff --git a/modules/tools/lookup/config.el b/modules/tools/lookup/config.el
index 6179615e8..8a44fde04 100644
--- a/modules/tools/lookup/config.el
+++ b/modules/tools/lookup/config.el
@@ -98,6 +98,11 @@ this list.")
 ;;
 ;;; xref
 
+;; The lookup commands are superior, and will consult xref if there are no
+;; better backends available.
+(global-set-key [remap xref-find-definitions] #'+lookup/definition)
+(global-set-key [remap xref-find-references]  #'+lookup/references)
+
 (after! xref
   ;; We already have `projectile-find-tag' and `evil-jump-to-tag', no need for
   ;; xref to be one too.
@@ -108,11 +113,6 @@ this list.")
       (funcall orig-fn)))
   (advice-add #'projectile-find-tag :around #'+lookup*projectile-find-tag)
 
-  ;; The lookup commands are superior, and will consult xref if there are no
-  ;; better backends available.
-  (global-set-key [remap xref-find-definitions] #'+lookup/definition)
-  (global-set-key [remap xref-find-references]  #'+lookup/references)
-
   ;; Use `better-jumper' instead of xref's marker stack
   (advice-add #'xref-push-marker-stack :around #'doom*set-jump)