diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
index cf11203..470cfb1 100644
--- a/autoload/fugitive.vim
+++ b/autoload/fugitive.vim
@@ -1593,9 +1593,12 @@ function! s:ReplaceCmd(cmd) abort
   if exec_error
     call s:throw((len(err) ? err : filereadable(temp) ? join(readfile(temp), ' ') : 'unknown error running ' . a:cmd))
   endif
-  silent exe 'keepalt $read ++edit' s:fnameescape(temp)
-  silent keepjumps 1delete _
+  silent exe 'lockmarks keepalt 0read ++edit' s:fnameescape(temp)
+  silent keepjumps $delete _
   call delete(temp)
+  if s:cpath(fnamemodify(bufname('$'), ':p'), temp)
+    silent! execute bufnr('$') . 'bwipeout'
+  endif
 endfunction
 
 function! s:QueryLog(refspec) abort