diff --git a/lua/autocmds.lua b/lua/autocmds.lua
index 2aee9f5..c22d83d 100644
--- a/lua/autocmds.lua
+++ b/lua/autocmds.lua
@@ -1,7 +1,21 @@
+local function augroup(name)
+    return vim.api.nvim_create_augroup("wf_" .. name, { clear = true })
+end
+
 vim.api.nvim_create_autocmd({ "FileType" }, {
+    group = augroup("spellcheck"),
     pattern = { "gitcommit", "markdown", "md", "mdx" },
     callback = function()
         vim.opt_local.spell = true
         vim.opt_local.wrap = true
     end
 })
+
+vim.api.nvim_create_autocmd({ "FileType" }, {
+    group = augroup("close_with_q"),
+    pattern = { "fugitive", "git", "gitcommit" },
+    callback = function(event)
+        vim.bo[event.buf].buflisted = false
+        vim.keymap.set("n", "q", "<cmd>close<cr>", { buffer = event.buf, silent = true })
+    end
+})