diff --git a/nvim/.config/nvim/after/ftplugin/fugitiveblame.vim b/nvim/.config/nvim/after/ftplugin/fugitiveblame.vim
new file mode 100644
index 0000000..8fd8802
--- /dev/null
+++ b/nvim/.config/nvim/after/ftplugin/fugitiveblame.vim
@@ -0,0 +1 @@
+nnoremap <buffer> <silent> q :bwipeout!<CR>
diff --git a/nvim/.config/nvim/after/plugin/fugitive.vim b/nvim/.config/nvim/after/plugin/fugitive.vim
index 80b7dcb..582b978 100644
--- a/nvim/.config/nvim/after/plugin/fugitive.vim
+++ b/nvim/.config/nvim/after/plugin/fugitive.vim
@@ -39,7 +39,7 @@ nnoremap <expr> <Leader>gP git#git_push()
 
 augroup custom_fugitive
   autocmd!
-  autocmd FileType fugitive,fugitiveblame nnoremap <buffer><silent> q :bwipeout!<CR>
-  autocmd BufReadPost fugitive:// setlocal bufhidden=wipe
+  autocmd BufReadPost fugitive://* setlocal bufhidden=wipe
+  autocmd User FugitiveObject,FugitiveIndex nnoremap <buffer><silent> q :bwipeout!<CR>
   autocmd User FugitiveIndex nmap <buffer> dt :Gtabedit <Plug><cfile><Bar>Gdiffsplit!<Bar>only<CR>
 augroup END