diff --git a/emacs/.emacs.d/config/init-editing.el b/emacs/.emacs.d/config/init-editing.el
index 6e4417c..8396524 100644
--- a/emacs/.emacs.d/config/init-editing.el
+++ b/emacs/.emacs.d/config/init-editing.el
@@ -1,12 +1,5 @@
 ;; General text editing configuration
 
-;; Tree-shaped undos
-(use-package undo-tree
-  :config
-  (global-undo-tree-mode)
-  :general
-  ("C-c C-r" #'undo-tree-visualize))
-
 ;; Better isearch
 (use-package ctrlf
   :config
diff --git a/emacs/.emacs.d/config/init-undo.el b/emacs/.emacs.d/config/init-undo.el
new file mode 100644
index 0000000..cd0d69c
--- /dev/null
+++ b/emacs/.emacs.d/config/init-undo.el
@@ -0,0 +1,9 @@
+;; Tree-shaped undos
+(use-package undo-tree
+  :demand t
+  :config
+  (global-undo-tree-mode)
+  :bind ("C-c C-r" . undo-tree-visualize))
+
+
+(provide 'init-undo)
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 11fd82a..cec5a3c 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -37,6 +37,7 @@
 ;; Load config modules
 (add-to-list 'load-path (expand-file-name "config" user-emacs-directory))
 (require 'init-defaults)
+(require 'init-undo)
 (require 'init-evil)
 (require 'init-keybindings)
 (require 'init-auth)