diff --git a/config/nvim/lua/fschauen/keymap.lua b/config/nvim/lua/fschauen/keymap.lua
index 4a56e7a..10f955b 100644
--- a/config/nvim/lua/fschauen/keymap.lua
+++ b/config/nvim/lua/fschauen/keymap.lua
@@ -109,6 +109,12 @@ local keymap = {
   -- quickly open lazy.nvim plugin manager
   { '<leader>L', '<cmd>Lazy<cr>' },
 
+  nvim_tree = {
+    { '<leader>nn', '<cmd>NvimTreeOpen<cr>' },
+    { '<leader>nf', '<cmd>NvimTreeFindFile<cr>' },
+    { '<leader>nc', '<cmd>NvimTreeClose<cr>' },
+  },
+
   -- toggle options
   { '<leader>sn', toggle_number },
   { '<leader>sr', toggle_relativenumber },
diff --git a/config/nvim/lua/fschauen/plugins/nvim-tree.lua b/config/nvim/lua/fschauen/plugins/nvim-tree.lua
index 34983fb..f282ab4 100644
--- a/config/nvim/lua/fschauen/plugins/nvim-tree.lua
+++ b/config/nvim/lua/fschauen/plugins/nvim-tree.lua
@@ -1,7 +1,9 @@
 return {
   'nvim-tree/nvim-tree.lua',
-
-  dependencies = { 'nvim-tree/nvim-web-devicons' },
+  dependencies = {
+    'nvim-tree/nvim-web-devicons'
+  },
+  keys = require('fschauen.keymap').nvim_tree,
   opts = {
     disable_netrw = true,       -- replace netrw with nvim-tree
     hijack_cursor = true,       -- keep the cursor on begin of the filename
@@ -38,16 +40,5 @@ return {
       highlight_git = true, -- enable highlight based on git attributes
     },
   },
-  cmd = {
-    'NvimTreeToggle',
-    'NvimTreeOpen',
-    'NvimTreeFocus',
-    'NvimTreeFindFileToggle'
-  },
-  keys = {
-    { '<leader>nn', '<cmd>NvimTreeOpen<cr>' },
-    { '<leader>nf', '<cmd>NvimTreeFindFile<cr>' },
-    { '<leader>nc', '<cmd>NvimTreeClose<cr>' },
-  },
 }