diff --git a/lua/gitsigns/popup.lua b/lua/gitsigns/popup.lua
index a1b68eead..ea47eb794 100644
--- a/lua/gitsigns/popup.lua
+++ b/lua/gitsigns/popup.lua
@@ -205,6 +205,8 @@ local function create_win(bufnr, opts, id)
   local group_id = api.nvim_create_augroup(group, {})
   local old_cursor = api.nvim_win_get_cursor(0)
 
+  vim.keymap.set('n', 'q', '<cmd>quit!<cr>', { silent = true, buffer = bufnr })
+
   api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, {
     group = group_id,
     callback = function()