diff --git a/modules/home-manager/cli/neovim/files/neotree.lua b/modules/home-manager/cli/neovim/files/neotree.lua
index f1d1728..da3b336 100644
--- a/modules/home-manager/cli/neovim/files/neotree.lua
+++ b/modules/home-manager/cli/neovim/files/neotree.lua
@@ -1,5 +1,6 @@
 local neotree = require 'neo-tree'
 neotree.setup({
+    close_if_last_window = true,
     filesystem = {
         filtered_items = {
             -- when true, they will just be displayed differently 
@@ -18,8 +19,7 @@ neotree.setup({
     }
 })
 
-vim.keymap.set('n', '<leader>ns', ':Neotree show<cr>', {desc='Neotree [S]how'})
 vim.keymap.set('n', '<leader>nc', ':Neotree close<cr>', {desc='Neotree [C]lose'})
-vim.keymap.set('n', '<leader>nf', ':Neotree focus<cr>', {desc='Neotree [F]ocus'})
-vim.keymap.set('n', '<leader>nb', ':Neotree show buffers<cr>', {desc='Neotree Nvim [B]uffers'})
-vim.keymap.set('n', '<leader>ng', ':Neotree show git_status<cr>', {desc='Neotree [G]it status'})
+vim.keymap.set('n', '<leader>nf', ':Neotree focus filesystem<cr>', {desc='Neotree [F]ocus'})
+vim.keymap.set('n', '<leader>nb', ':Neotree focus buffers<cr>', {desc='Neotree Nvim [B]uffers'})
+vim.keymap.set('n', '<leader>ng', ':Neotree focus git_status<cr>', {desc='Neotree [G]it status'})