diff --git a/emacs/init.el b/emacs/init.el
index c734313..d123ea2 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -405,7 +405,8 @@
   :demand t
   :hook ((evil-local-mode . turn-on-undo-tree-mode))
   :init
-  (setq evil-want-keybinding nil)
+  (setq evil-want-keybinding nil
+        evil-undo-system     'undo-tree)
   :config
   (setq evil-cjk-emacs-word-boundary t
         evil-cross-lines t
@@ -419,8 +420,7 @@
         evil-replace-state-tag  "r"
         evil-visual-state-tag   'agw-evil-visual-state-tag
         evil-motion-state-tag   "m"
-        evil-emacs-state-tag    "x"
-        evil-undo-system        'undo-tree)
+        evil-emacs-state-tag    "x")
   (evil-mode t)
 
   (evil-global-set-key 'visual (kbd "g s") #'sort-lines)