diff --git a/lua/avante/config.lua b/lua/avante/config.lua
index da5b5b5..5510043 100644
--- a/lua/avante/config.lua
+++ b/lua/avante/config.lua
@@ -197,6 +197,7 @@ M._defaults = {
       reverse_switch_windows = "<S-Tab>",
       remove_file = "d",
       add_file = "@",
+      close = { "<Esc>", "q" },
     },
     files = {
       add_current = "<leader>ac", -- Add current buffer to selected files
diff --git a/lua/avante/sidebar.lua b/lua/avante/sidebar.lua
index 535a882..7604958 100644
--- a/lua/avante/sidebar.lua
+++ b/lua/avante/sidebar.lua
@@ -2138,12 +2138,7 @@ function Sidebar:render(opts)
     xpcall(function() api.nvim_buf_set_name(self.result_container.bufnr, RESULT_BUF_NAME) end, function(_) end)
   end)
 
-  self.result_container:map("n", "q", function()
-    Llm.cancel_inflight_request()
-    self:close()
-  end)
-
-  self.result_container:map("n", "<Esc>", function()
+  self.result_container:map("n", Config.mappings.sidebar.close, function()
     Llm.cancel_inflight_request()
     self:close()
   end)