diff --git a/layers/+source-control/git/README.org b/layers/+source-control/git/README.org
index 898d091f8..cf8310ffa 100644
--- a/layers/+source-control/git/README.org
+++ b/layers/+source-control/git/README.org
@@ -130,9 +130,10 @@ Spacemacs uses [[http://magit.vc/][magit]] to manage Git repositories.
 
 To open a =status buffer=, type in a buffer of a Git repository: ~SPC g s~
 
-Spacemacs uses [[https://github.com/justbur/evil-magit][evil-magit]] for key bindings in magit buffers, which are the
-standard magit key bindings with some minimal changes to make them comfortable
-for evil users.
+Spacemacs uses [[https://github.com/justbur/evil-magit][evil-magit]] for key bindings in magit buffers (unless your editing
+style is set to emacs, in which case you get the default magit bindings), which
+are the standard magit key bindings with some minimal changes to make them
+comfortable for evil users.
 
 Here are the often used bindings inside a =status buffer=:
 
diff --git a/layers/+source-control/git/packages.el b/layers/+source-control/git/packages.el
index 8957baff3..49b927d6c 100644
--- a/layers/+source-control/git/packages.el
+++ b/layers/+source-control/git/packages.el
@@ -28,9 +28,10 @@
         ))
 
 (defun git/init-evil-magit ()
-  (with-eval-after-load 'magit
-    (setq evil-magit-state 'motion)
-    (require 'evil-magit)))
+  (unless (eq dotspacemacs-editing-style 'emacs)
+    (with-eval-after-load 'magit
+      (setq evil-magit-state 'motion)
+      (require 'evil-magit))))
 
 (defun git/init-helm-gitignore ()
   (use-package helm-gitignore