diff --git a/nvim/lua/plugins/auto-save.lua b/nvim/lua/plugins/auto-save.lua
index 05557a5..8bd85cd 100644
--- a/nvim/lua/plugins/auto-save.lua
+++ b/nvim/lua/plugins/auto-save.lua
@@ -18,7 +18,7 @@ return {
 					return false
 				end
 				local ft = vim.fn.getbufvar(buf, "&filetype")
-				return ft ~= "oil" and ft ~= "harpoon"
+				return ft ~= "oil" and ft ~= "harpoon" and ft ~= "qf"
 			end,
 		},
 		beforeAll = function()
diff --git a/nvim/lua/settings.lua b/nvim/lua/settings.lua
index 1d27dbf..276f42d 100644
--- a/nvim/lua/settings.lua
+++ b/nvim/lua/settings.lua
@@ -115,12 +115,12 @@ vim.api.nvim_create_autocmd("TextYankPost", {
 	end,
 })
 
-vim.api.nvim_create_autocmd("BufEnter", {
+vim.api.nvim_create_autocmd("FileType", {
 	desc = "Disable comment continuation (enter or o/O)",
 	group = vim.api.nvim_create_augroup("comment-ro", { clear = true }),
 	callback = function()
-		vim.opt.formatoptions:remove("ro")
-		vim.opt_local.formatoptions:remove("ro")
+		vim.opt.formatoptions:remove({"r", "o"})
+		vim.opt_local.formatoptions:remove({"r", "o"})
 	end,
 })