diff --git a/remap.lua b/remap.lua
index df375e1..b562fea 100644
--- a/remap.lua
+++ b/remap.lua
@@ -89,5 +89,13 @@ vim.keymap.set("t", "<Esc>", "<C-\\><C-n>")
 -- vim.keymap.set("n", "<leader>xl", function() trouble.toggle("loclist") end, { desc = "Toggle [L]oc list" })
 --
 
-vim.keymap.set("n", "<leader>to", ":tabnew<CR>", {desc="[T]ab [O]pen"})
-vim.keymap.set("n", "<leader>tc", ":tabclose<CR>", {desc="[T]ab [C]lose"})
+vim.keymap.set("n", "<leader>to", ":tabnew<CR>", { desc = "[T]ab [O]pen" })
+vim.keymap.set("n", "<leader>tc", ":tabclose<CR>", { desc = "[T]ab [C]lose" })
+vim.api.nvim_create_autocmd("FileType", {
+    pattern = { "qf" },
+    callback = function()
+        vim.schedule(function()
+            vim.keymap.set("n", "q", ":q<cr>", { desc = "Close current QuickFix buffer" })
+        end)
+    end
+})