diff --git a/init.el b/init.el
index a85b51d..f302aa0 100755
--- a/init.el
+++ b/init.el
@@ -119,6 +119,14 @@
 	 ("C-:" . avy-goto-word-1)
 	 ("M-g g" . avy-goto-line)))
 
+(use-package undo-tree
+  :after evil
+  :config
+  (advice-add #'evil-undo :override #'undo-tree-undo)
+  (advice-add #'evil-redo :override #'undo-tree-redo)
+  (define-key evil-normal-state-map (kbd "SPC u v") #'undo-tree-visualize)
+  (global-undo-tree-mode))
+
 ;; Magit (git frontend)
 (use-package magit)
 
@@ -285,7 +293,6 @@
   (define-key evil-normal-state-map (kbd "SPC l = r") #'lsp-format-region)
   (define-key evil-normal-state-map (kbd "SPC l s q") #'lsp-workspace-shutdown)
   (define-key evil-normal-state-map (kbd "SPC l s r") #'lsp-workspace-restart)
-  (define-key evil-normal-state-map (kbd "SPC l i") #'lsp-ui-doc-glance)
   (define-key evil-normal-state-map (kbd "SPC d") #'lsp-describe-thing-at-point)
   ;; Controls inside references popup
   (define-key lsp-ui-peek-mode-map (kbd "j") #'lsp-ui-peek--select-next)