diff --git a/nvim/init.lua b/nvim/init.lua
index 151f39b..f6b20c0 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -97,7 +97,10 @@ vim.keymap.set("n", "t", ":FloatermNew<CR>",    { silent = true })
 vim.keymap.set("n", "e", ":NERDTreeToggle<CR><C-W>l", { silent = true })
 vim.keymap.set("n", "s", ":DBUIToggle<CR>",     { silent = true })
 vim.keymap.set("n", "x", "<Plug>(DBUI_ExecuteQuery)", { remap = true })
-vim.keymap.set("n", "q", ":wq<CR>",             { silent = true })
+vim.keymap.set("n", "q", function()
+  local ok = pcall(vim.cmd, "wq")
+  if not ok then vim.cmd("q") end
+end, { silent = true })
 
 -- insert mode completion
 vim.keymap.set("i", "<TAB>",   "<C-N>")