diff --git a/modules/jenga-init.el b/modules/jenga-init.el
index 5fa8e2b..916fe97 100644
--- a/modules/jenga-init.el
+++ b/modules/jenga-init.el
@@ -1,10 +1,6 @@
 ;; Persist command history
 (savehist-mode 1)
 
-;; Enable C-r in evil
-(use-package undo-tree
-    :ensure t)
-
 ;;;; TAGS configuration.
 ;; Goto tag with M-.
 (global-set-key "\M-." 'etags-select-find-tag)
@@ -70,16 +66,17 @@
           evil-vsplit-window-right t
           evil-split-window-below t
           evil-shift-round nil
+          evil-undo-system 'undo-tree
           evil-want-C-u-scroll t)
     :config ;; tweak evil after loading it
+    (use-package undo-tree)
     (evil-mode)
     (setq evil-want-C-u-scroll t)
     (eval-after-load "evil-maps"
       ;; Unset Evil's "M-." keymap to enable symbol definition following.
       (define-key evil-normal-state-map "\M-." nil)))
 
-(use-package undo-tree
-    :ensure t)
+(add-hook 'evil-local-mode-hook 'turn-on-undo-tree-mode)
 
 ;;;; Heml mode configuration.
 (use-package helm