diff --git a/contrib/!source-control/git/extensions.el b/contrib/!source-control/git/extensions.el
index 178691421..63ac8283f 100644
--- a/contrib/!source-control/git/extensions.el
+++ b/contrib/!source-control/git/extensions.el
@@ -52,9 +52,9 @@
     (progn
       ;; (spacemacs|hide-lighter magit-auto-revert-mode)
 
+
       ;; mode maps
       (spacemacs/evilify-map 'magit-mode-map)
-      ;; (spacemacs/evilify-map 'magit-popup-mode-map  'magit-popup-mode)
       (spacemacs/evilify-map 'magit-status-mode-map 'magit-status-mode)
       (spacemacs/evilify-map 'magit-refs-mode-map 'magit-refs-mode)
       (spacemacs/evilify-map 'magit-blame-mode-map 'magit-blame-mode)
@@ -65,6 +65,11 @@
       (spacemacs/evilify-map 'magit-cherry-mode-map 'magit-cherry-mode)
       (spacemacs/evilify-map 'magit-reflog-mode-map 'magit-reflog-mode)
       (spacemacs/evilify-map 'magit-process-mode-map 'magit-process-mode)
+      ;; default state for additional modes
+      (dolist (mode '(magit-popup-mode
+                      magit-popup-sequence-mode))
+        (add-to-list 'evil-insert-state-modes mode))
+      (spacemacs/evilify-configure-default-state 'magit-revision-mode)
       ;; section maps
       (spacemacs/evilify-map 'magit-tag-section-map)
       (spacemacs/evilify-map 'magit-untracked-section-map)