diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el
index 92e70cd88..1ff772114 100644
--- a/modules/tools/magit/config.el
+++ b/modules/tools/magit/config.el
@@ -101,11 +101,6 @@
   :preface
   (setq forge-database-file (concat doom-etc-dir "forge/forge-database.sqlite"))
   :config
-  ;; Map Forge jumps in `evil-mode'
-  (when (featurep! :editor evil +everywhere)
-    (map! :map magit-mode-map
-      :n "gi" #'forge-jump-to-issues
-      :n "gm" #'forge-jump-to-pullreqs))
   ;; All forge list modes are derived from `forge-topic-list-mode'
   (map! :map forge-topic-list-mode-map :n "q" #'kill-current-buffer)
   (set-popup-rule! "^\\*?[0-9]+:\\(?:new-\\|[0-9]+$\\)" :size 0.45 :modeline t :ttl 0 :quit nil)
@@ -179,7 +174,9 @@ ensure it is built when we actually use Forge."
     "zt" #'evil-scroll-line-to-top
     "zz" #'evil-scroll-line-to-center
     "zb" #'evil-scroll-line-to-bottom
-    "g=" #'magit-diff-default-context)
+    "g=" #'magit-diff-default-context
+    "gi" #'forge-jump-to-issues
+    "gm" #'forge-jump-to-pullreqs)
   (define-key! 'normal
     (magit-status-mode-map
      magit-stash-mode-map