diff --git a/.config/nvim/lua/user/keymaps.lua b/.config/nvim/lua/user/keymaps.lua
index 29c8c9c..1661b78 100644
--- a/.config/nvim/lua/user/keymaps.lua
+++ b/.config/nvim/lua/user/keymaps.lua
@@ -7,8 +7,6 @@ vim.g.mapleader = " "
 vim.g.maplocalleader = " "
 
 -- Better escape
-map("v", "jj", "<Esc>", opts)
-map("x", "jj", "<Esc>", opts)
 map("i", "jj", "<Esc>", opts)
 
 -- Configuration
@@ -56,7 +54,7 @@ map("n", "<C-w>]", "<cmd>vertical resize +8<CR>", opts)
 
 -- File explorer
 map("n", "<C-f>", ":NvimTreeFindFile<CR>", opts)
-map("n", "<Leader>f", ":NvimTreeClose<CR>", opts)
+map("n", "<Leader>f", ":NvimTreeToggle<CR>", opts)
 
 -- Preserve visual paste
 map("v", "p", '"_dP', opts)
diff --git a/.vimrc b/.vimrc
index 79d9314..b0fd680 100644
--- a/.vimrc
+++ b/.vimrc
@@ -51,8 +51,6 @@ let mapleader = "\<space>"
 
 " Better Escape
 inoremap <silent> jj <Esc>
-cnoremap <silent> jj <Esc>
-vnoremap <silent> jj <Esc>
 
 " Configuration
 nnoremap <Leader>se :e $MYVIMRC<CR>