diff --git a/autoload/go/fmt.vim b/autoload/go/fmt.vim
index 35fab7d44f..64b10bf709 100644
--- a/autoload/go/fmt.vim
+++ b/autoload/go/fmt.vim
@@ -110,14 +110,16 @@ function! go#fmt#Format(withGoimport)
         let default_srr = &srr
         set srr=>%s 
 
-        "delete everything first from the buffer
-        %delete _  
-
-        " replace with gofmted content
-        call append(0, splitted)
+        " delete any leftover before we replace the whole file. Suppose the
+        " file had 20 lines, but new output has 10 lines, only 1-10 are
+        " replaced with setline, remaining lines 11-20 won't get touched. So
+        " remove them.
+        if line('$') > len(splitted)
+            execute len(splitted) .',$delete'
+        endif
 
-        " delete last line that comes from the append call
-        $delete _  
+        " setline iterates over the list and replaces each line
+        call setline(1, splitted)
 
         " only clear quickfix if it was previously set, this prevents closing
         " other quickfixes