diff --git a/lua/codewindow.lua b/lua/codewindow.lua
index 90bf875..eae3551 100644
--- a/lua/codewindow.lua
+++ b/lua/codewindow.lua
@@ -57,7 +57,7 @@ function M.setup(config)
 
   minimap_hl.setup()
 
-  api.nvim_create_autocmd({ 'BufEnter', 'WinEnter' }, {
+  api.nvim_create_autocmd({'BufWinEnter'}, {
     callback = function()
       local filetype = vim.bo.filetype
       local should_open = false
@@ -86,6 +86,12 @@ function M.setup(config)
       end
     end
   })
+
+  api.nvim_create_autocmd({'TabLeave'}, {
+    callback = function()
+        defer(M.close_minimap)
+    end
+  })
 end
 
 return M