diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
index 4a57cedcf0..8e68428ce5 100644
--- a/autoload/fugitive.vim
+++ b/autoload/fugitive.vim
@@ -1580,6 +1580,7 @@ function! fugitive#BufReadStatus() abort
     nnoremap <buffer> <silent> P :<C-U>execute <SID>StagePatch(line('.'),line('.')+v:count1-1)<CR>
     xnoremap <buffer> <silent> P :<C-U>execute <SID>StagePatch(line("'<"),line("'>"))<CR>
     nnoremap <buffer> <silent> q :<C-U>if bufnr('$') == 1<Bar>quit<Bar>else<Bar>bdelete<Bar>endif<CR>
+    nnoremap <buffer> <silent> gq :<C-U>if bufnr('$') == 1<Bar>quit<Bar>else<Bar>bdelete<Bar>endif<CR>
     nnoremap <buffer> <silent> R :<C-U>exe <SID>ReloadStatus()<CR>
     nnoremap <buffer> <silent> U :<C-U>echoerr 'Changed to X'<CR>
     nnoremap <buffer> <silent> g<Bar> :<C-U>execute <SID>StageDelete(line('.'),v:count)<CR>
diff --git a/doc/fugitive.txt b/doc/fugitive.txt
index 3ccdd1e051..16f20f15b4 100644
--- a/doc/fugitive.txt
+++ b/doc/fugitive.txt
@@ -385,8 +385,8 @@ rd                      Perform an interactive rebase with the commit under
                                                 *fugitive-misc-mappings*
 Miscellaneous mappings ~
 
-                                                *fugitive_q*
-q                       Close the status buffer.
+                                                *fugitive_gq* *fugitive_q*
+gq                      Close the status buffer.
 
                                                 *fugitive_R*
 R                       Reload the status buffer.