diff --git a/plugin/magit.vim b/plugin/magit.vim
index 2523a0c322d7e76cea62796372419d11cf7e8bb1..609451e476765d75b85bf6cccd5f489f9adfea8a 100644
--- a/plugin/magit.vim
+++ b/plugin/magit.vim
@@ -1149,7 +1149,15 @@ function! magit#jump_to()
 		execute buf_win."wincmd w"
 	endif
 
+	try
 		execute "edit " . "+" . line . " " filename
+	catch
+		if ( v:exception == 'Vim:Interrupt' && buf_win == 0)
+			close
+		elseif ( v:exception != 'Vim(edit):E325: ATTENTION' )
+			throw v:exception
+		endif
+	endtry
 endfunction
 
 function! magit#update_diff(way)