diff --git a/vim/after/ftplugin/fugitive.vim b/vim/after/ftplugin/fugitive.vim
new file mode 100644
index 0000000..2e36f95
--- /dev/null
+++ b/vim/after/ftplugin/fugitive.vim
@@ -0,0 +1,3 @@
+" Keep `q` to quit GStatus window
+" https://github.com/tpope/vim-fugitive/commit/a510b3aadf3f39711c113371c18adc48ad54e6ee#commitcomment-35424504
+nnoremap <buffer> q <c-w>q