diff --git a/modules/feature/version-control/+git.el b/modules/feature/version-control/+git.el
index 62afce15c..6303b0caa 100644
--- a/modules/feature/version-control/+git.el
+++ b/modules/feature/version-control/+git.el
@@ -69,15 +69,16 @@
 
 
 (def-package! magit
-  :commands (magit-status magit-blame))
+  :commands (magit-status magit-blame)
+  :config
+  (set! :evil-state 'magit-status-mode 'emacs)
+  (after!
+    ;; Switch to emacs state only while in `magit-blame-mode', then back when
+    ;; its done (since it's a minor-mode).
+    (add-hook! 'magit-blame-mode-hook
+      (evil-local-mode (if magit-blame-mode -1 +1)))))
 
 
 (def-package! git-link
   :commands (git-link git-link-commit git-link-homepage))
 
-
-(def-package! evil-magit
-  :when (featurep! :feature evil)
-  :after magit
-  :init (setq evil-magit-want-horizontal-movement t))
-
diff --git a/modules/feature/version-control/packages.el b/modules/feature/version-control/packages.el
index df3281c38..43dfb68fe 100644
--- a/modules/feature/version-control/packages.el
+++ b/modules/feature/version-control/packages.el
@@ -11,7 +11,5 @@
 (package! gitconfig-mode)
 (package! gitignore-mode)
 (package! magit)
-(when (featurep! :feature evil)
-  (package! evil-magit))
 
 ;;; TODO +hg