diff --git a/home-manager/common/software/cli/nixvim.nix b/home-manager/common/software/cli/nixvim.nix
index e8aadc3b..39e19b1a 100644
--- a/home-manager/common/software/cli/nixvim.nix
+++ b/home-manager/common/software/cli/nixvim.nix
@@ -42,10 +42,10 @@
             # Insert Mode
 
             # Normal Mode
-            (nmap "<leader>ns" ":Neotree selector<C-r>"// desc "[S]elect neotree")
-            (nmap "<leader>nt" ":Neotree toggle<C-r>" // desc "[T]oggle neotree")
-            (nmap "<leader>nc" ":Neotree close<C-r>" // desc "[C]lose neotree")
-            (nmap "<leader>nb" ":Neotree buffers<C-r>" // desc "Open [b]uffers")
+            (nmap "<leader>nf" ":NvimTreeFocus<CR>"// desc "[F]ocus NvimTree")
+            (nmap "<leader>nt" ":NvimTreeToggle<CR>" // desc "[T]oggle NvimTree")
+            (nmap "<leader>ns" ":NvimTreeToggle<CR>" // desc "[S]earch NvimTree")
+            (nmap "<leader>nc" ":NvimTree close<CR>" // desc "[C]lose NvimTree")
         ];
 
         options = {