diff --git a/plugin/fugitive.vim b/plugin/fugitive.vim
index f037b65..0ee9d04 100644
--- a/plugin/fugitive.vim
+++ b/plugin/fugitive.vim
@@ -1681,6 +1681,7 @@ function! s:diffoff() abort
 endfunction
 
 function! s:diffoff_all(dir) abort
+  let curwin = winnr()
   for nr in range(1,winnr('$'))
     if getwinvar(nr,'&diff')
       if nr != winnr()
@@ -1692,6 +1693,7 @@ function! s:diffoff_all(dir) abort
       endif
     endif
   endfor
+  execute curwin.'wincmd w'
 endfunction
 
 function! s:buffer_compare_age(commit) dict abort