diff --git a/autoload/gitgutter/diff.vim b/autoload/gitgutter/diff.vim
index 68b2117..a7c8545 100644
--- a/autoload/gitgutter/diff.vim
+++ b/autoload/gitgutter/diff.vim
@@ -13,6 +13,7 @@ let s:c_flag = s:git_supports_command_line_config_override()
 
 let s:temp_from = tempname()
 let s:temp_buffer = tempname()
+let s:counter = 0
 
 " Returns a diff of the buffer against the index or the working tree.
 "
@@ -89,6 +90,11 @@ function! gitgutter#diff#run_diff(bufnr, from, preserve_full_diff) abort
   " git-diff).
   let buff_file = s:temp_buffer.'.'.a:bufnr
 
+  " Add a counter to avoid a similar race with two quick writes of the same buffer.
+  " Use a modulus greater than a maximum reasonable number of visible buffers.
+  let s:counter = (s:counter + 1) % 20
+  let buff_file .= '.'.s:counter
+
   let extension = gitgutter#utility#extension(a:bufnr)
   if !empty(extension)
     let buff_file .= '.'.extension
@@ -104,6 +110,9 @@ function! gitgutter#diff#run_diff(bufnr, from, preserve_full_diff) abort
     " reading it (with git-diff).
     let from_file = s:temp_from.'.'.a:bufnr
 
+    " Add a counter to avoid a similar race with two quick writes of the same buffer.
+    let from_file .= '.'.s:counter
+
     if !empty(extension)
       let from_file .= '.'.extension
     endif