diff --git a/lib/extensions/development.el b/lib/extensions/development.el
index 42f5281..14762de 100644
--- a/lib/extensions/development.el
+++ b/lib/extensions/development.el
@@ -34,7 +34,8 @@
 (with-ability git
               (depends-on 'diff-hl)
               (depends-on 'magit)
-              (depends-on 'gh))
+              (depends-on 'gh)
+              (depends-on 'evil-magit))
 
 (with-ability github
               (depends-on 'magithub))
diff --git a/lib/extensions/development/init.el b/lib/extensions/development/init.el
index 7a21d9a..f1dab33 100644
--- a/lib/extensions/development/init.el
+++ b/lib/extensions/development/init.el
@@ -180,7 +180,11 @@
            (cheatsheet-add :group '--Development--
                            :key   "C-x g"
                            :description "Rise up MAGIT. Git interface for FG42")
-           (global-set-key (kbd "C-x g") 'magit-status))
+           (global-set-key (kbd "C-x g") 'magit-status)
+           (when (is-evil?)
+             (add-hook 'magit-mode-hook (lambda () (require 'evil-magit)))
+             (defkey global-map 'magit-status :evil (:normal "SPC g s"))))
+
 
   (ability github ()
            "Github support"