diff --git a/lua/keys.lua b/lua/keys.lua
index 89324c9..d647ef3 100644
--- a/lua/keys.lua
+++ b/lua/keys.lua
@@ -1,17 +1,16 @@
 local key = vim.api.nvim_set_keymap
 local u = require('utils')
 
-vim.cmd([[autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif]])
 vim.cmd([[autocmd CursorHold * lua vim.diagnostic.open_float({focusable = false})]])
 
 key('n', ';', ':Telescope find_files<CR>', {})
 key('', '<C-n>', ':NvimTreeToggle<CR>', {})
 key('n', 'gh', '/<c-r>=expand("<cword>")<CR><CR>N', {})
 
-key('i', '<TAB>', 'pumvisible() ? "<C-n>" : "<Tab>"', {expr = true, silent = true})
-key('i', '<S-TAB>', 'pumvisible() ? "<C-p>" : "<S-Tab>"', {expr = true, silent = true})
-key('n','<leader>g',':lua require"telescope.builtin".live_grep{}<CR>', {})
-key('v', '<leader>c', ':w !xclip -sel c<CR><CR>', {silent = true})
+key('i', '<TAB>', 'pumvisible() ? "<C-n>" : "<Tab>"', { expr = true, silent = true })
+key('i', '<S-TAB>', 'pumvisible() ? "<C-p>" : "<S-Tab>"', { expr = true, silent = true })
+key('n', '<leader>g', ':lua require"telescope.builtin".live_grep{}<CR>', {})
+key('v', '<leader>c', ':w !xclip -sel c<CR><CR>', { silent = true })
 
 -- Highlight on yank
 vim.api.nvim_exec(
@@ -20,7 +19,15 @@ vim.api.nvim_exec(
     autocmd!
     autocmd TextYankPost * silent! lua vim.highlight.on_yank()
   augroup end
-]],
+]] ,
   false
 )
 
+vim.api.nvim_create_autocmd("BufEnter", {
+  nested = true,
+  callback = function()
+    if #vim.api.nvim_list_wins() == 1 and vim.api.nvim_buf_get_name(0):match("NvimTree_") ~= nil then
+      vim.cmd 'quit'
+    end
+  end
+})
diff --git a/lua/lsp.lua b/lua/lsp.lua
index a16d24a..c8c24c2 100644
--- a/lua/lsp.lua
+++ b/lua/lsp.lua
@@ -20,7 +20,7 @@ local on_attach = function(client, bufnr)
   buf_set_keymap('n', 'gd',    ':lua vim.lsp.buf.definition()<CR>',       opts)
   buf_set_keymap('n', 'ga',    ':lua vim.lsp.buf.code_action()<CR>',      opts)
   buf_set_keymap('n', 'ff',    ':lua vim.lsp.buf.formatting()<CR>',       opts)
-  buf_set_keymap('n', 'gn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
+  buf_set_keymap('n', 'gn',    '<cmd>lua vim.lsp.buf.rename()<CR>',       opts)
 
   --require'completion'.on_attach(client)