diff --git a/templates/nvim/lua/keybindings.lua.j2 b/templates/nvim/lua/keybindings.lua.j2
index 731135a..be7e754 100644
--- a/templates/nvim/lua/keybindings.lua.j2
+++ b/templates/nvim/lua/keybindings.lua.j2
@@ -1,8 +1,7 @@
 -- {{ ansible_managed }}
 
-local opts = {noremap=true, silent=true}
+local opts = { noremap = true, silent = true }
 
-vim.api.nvim_set_keymap('n', '<C-E>', '<cmd>:NvimTreeToggle<CR>', opts)
 vim.api.nvim_set_keymap('n', 'ff', '<cmd>lua require("telescope.builtin").find_files()<CR>', opts)
 vim.api.nvim_set_keymap('n', 'fg', '<cmd>lua require("telescope.builtin").live_grep()<CR>', opts)
 vim.api.nvim_set_keymap('n', 'fb', '<cmd>lua require("telescope.builtin").buffers()<CR>', opts)
diff --git a/templates/nvim/lua/nvim-tree.lua.j2 b/templates/nvim/lua/nvim-tree.lua.j2
index 904f72b..d81328e 100644
--- a/templates/nvim/lua/nvim-tree.lua.j2
+++ b/templates/nvim/lua/nvim-tree.lua.j2
@@ -2,10 +2,18 @@
 
 local nvim_tree = require('nvim-tree');
 local nvim_tree_icons = require('nvim-web-devicons');
+local api = require('nvim-tree.api')
+
+local function toggle_tree()
+  api.tree.toggle({ find_file = true, update_root = true, focus = true })
+end
+
+vim.api.nvim_set_keymap(
+  'n', '<C-E>', '',
+  { noremap = true, silent = true, callback = toggle_tree }
+)
 
 local function my_on_attach(bufnr)
-  local api = require('nvim-tree.api')
-
   local function opts(desc)
     return { desc = 'nvim-tree: ' .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true }
   end