diff --git a/lua/avante/selection.lua b/lua/avante/selection.lua
index 1fa0bc1..c2f2ef8 100644
--- a/lua/avante/selection.lua
+++ b/lua/avante/selection.lua
@@ -95,6 +95,16 @@ function Selection:setup_autocmds()
       end
     end,
   })
+
+  api.nvim_create_autocmd({ "BufLeave" }, {
+    group = self.augroup,
+    callback = function(ev)
+      if not Utils.is_sidebar_buffer(ev.buf) then
+        self:close_hints_popup()
+      end
+    end,
+  })
+
   return self
 end