diff --git a/plugin/fugitive.vim b/plugin/fugitive.vim
index 83d8932..41299c8 100644
--- a/plugin/fugitive.vim
+++ b/plugin/fugitive.vim
@@ -1883,7 +1883,10 @@ function! s:BufReadIndex()
       endtry
       set ft=gitcommit
     endif
-    setlocal ro noma nomod noswapfile bufhidden=wipe
+    setlocal ro noma nomod noswapfile
+    if &bufhidden ==# ''
+      setlocal bufhidden=delete
+    endif
     call s:JumpInit()
     nunmap   <buffer>          P
     nunmap   <buffer>          ~