diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 34611ce..8e8ca59 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -1005,29 +1005,15 @@ from myaethon2.core.decorators import (
     :type line
     (sort-lines nil beg end))
 
-  (setf evil-emacs-state-modes
-        (append evil-emacs-state-modes
-                '(
-                  Info-mode
-                  avandu-article-mode
-                  avandu-overview-mode
-                  calculator-mode
-                  diff-mode
-                  gnus-article-mode
-                  gnus-group-mode
-                  gnus-summary-mode
-                  grep-mode
-                  help-mode
-                  jabber-chat-mode
-                  jabber-roster-mode
-                  magit-key-mode
-                  magit-status-mode
-                  messages-buffer-mode
-                  prodigy-mode
-                  prodigy-view-mode
-                  sql-interactive-mode
-                  )))
-
+  (mapc (lambda (mode) (evil-set-initial-state mode 'emacs))
+        '(jabber-roster-mode grep-mode avandu-overview-mode
+                             avandu-article-mode gnus-summary-mode
+                             gnus-article-mode gnus-group-mode
+                             magit-status-mode magit-key-mode
+                             sql-interactive-mode Info-mode
+                             jabber-chat-mode diff-mode prodigy-mode
+                             calculator-mode messages-buffer-mode
+                             help-mode prodigy-view-mode))
   (evil-set-initial-state 'git-commit-mode 'normal)
   (require 'evil-nerd-commenter)
   (define-key evil-normal-state-map ",s" 'oni:evil-sort-lines-operator)