diff --git a/.spacemacs b/.spacemacs
index 0160b24..1b7a6c6 100644
--- a/.spacemacs
+++ b/.spacemacs
@@ -31,7 +31,6 @@ values."
      github
      markdown
      org
-     spacemacs-ivy
      (shell :variables
             shell-default-height 30
             shell-default-position 'bottom)
@@ -275,6 +274,9 @@ in `dotspacemacs/user-config'."
         `((".*" . ,(concat spacemacs-cache-directory "undo-tree-history"))))
   (setq undo-tree-auto-save-history t)
 
+  ;; Allow vim-like undo
+  (setq evil-want-fine-undo "No")
+
   ;; Don't use the clipboard please
   ;; (setq select-enable-clipboard nil)
   ;; Don't show the menu bar on the terminal