diff --git a/neovim/.config/nvim/after/plugin/options.lua b/neovim/.config/nvim/after/plugin/options.lua
index 56085ed..95cbace 100644
--- a/neovim/.config/nvim/after/plugin/options.lua
+++ b/neovim/.config/nvim/after/plugin/options.lua
@@ -44,3 +44,6 @@ opt.showmode = false
 opt.redrawtime = 4000
 opt.list = true
 opt.listchars = { multispace = "·", tab = ">~" }
+
+opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
+opt.undofile = true
diff --git a/neovim/.config/nvim/after/plugin/remaps.lua b/neovim/.config/nvim/after/plugin/remaps.lua
index 05d6d8f..d877357 100644
--- a/neovim/.config/nvim/after/plugin/remaps.lua
+++ b/neovim/.config/nvim/after/plugin/remaps.lua
@@ -121,3 +121,11 @@ vim.keymap.set("i", "<C-l>", next_choice, { noremap = true, silent = true })
 vim.keymap.set("s", "<C-l>", next_choice, { noremap = true, silent = true })
 vim.keymap.set("i", "<C-h>", prev_choice, { noremap = true, silent = true })
 vim.keymap.set("s", "<C-h>", prev_choice, { noremap = true, silent = true })
+
+-- Undotree
+vim.keymap.set("n", "<leader>u", function()
+  vim.cmd([[
+    UndotreeToggle
+    UndotreeFocus
+  ]])
+end)
diff --git a/neovim/.config/nvim/init.lua b/neovim/.config/nvim/init.lua
index 8d1dfd6..4c9503b 100644
--- a/neovim/.config/nvim/init.lua
+++ b/neovim/.config/nvim/init.lua
@@ -122,6 +122,8 @@ require("packer").startup(function(use)
     end,
   })
 
+  use({ "mbbill/undotree" })
+
   if PACKER_BOOTSTRAP then
     require("packer").sync()
   end