diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index e24b5ed..b75e516 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -12,6 +12,9 @@ Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
 " Git
 Plug 'airblade/vim-gitgutter'
 
+" Undo tree
+Plug 'mbbill/undotree'
+
 call plug#end()
 
 "
@@ -32,6 +35,11 @@ set spelllang=en " Check language spelling in english
 "
 colorscheme zellner
 
+"
+" CtrlP
+"
+map <C-S-P> <Esc>:CtrlPBuffer<CR>
+
 "
 " Deoplete
 "
@@ -39,3 +47,8 @@ let g:deoplete#enable_at_startup = 1
 
 " - Autocomplete with <Tab>
 inoremap <expr><TAB>  pumvisible() ? "\<C-n>" : "\<TAB>"
+
+"
+" UndoTree
+"
+map <C-S-u> <Esc>:UndotreeToggle<CR>