diff --git a/autoload/go/guru.vim b/autoload/go/guru.vim
index 3fb5a7d577..e74e0d8521 100644
--- a/autoload/go/guru.vim
+++ b/autoload/go/guru.vim
@@ -1,5 +1,6 @@
 "  guru.vim -- Vim integration for the Go guru.
 
+let s:sameid = 0
 
 func! s:RunGuru(mode, format, selected, needs_scope) range abort
   "return with a warning if the binary doesn't exist
@@ -364,15 +365,28 @@ function! go#guru#SameIds(selected)
     let pos = split(item, ':')
     call matchaddpos('goSameId', [[str2nr(pos[-2]), str2nr(pos[-1]), str2nr(poslen)]])
   endfor
+
+  let s:sameid = 1
+endfunction
+
+function! go#guru#SameIdRenamed()
+  if s:sameid
+    call go#guru#SameIds(-1)
+  endif
 endfunction
 
 function! go#guru#ClearSameIds()
+  if !s:sameid
+    return
+  endif
+
   let m = getmatches()
   for item in m
     if item['group'] == 'goSameId'
       call matchdelete(item['id'])
     endif
   endfor
+  let s:sameid = 0
 endfunction
 
 function! go#guru#ToggleSameIds(selected)
diff --git a/autoload/go/rename.vim b/autoload/go/rename.vim
index d65256c517..0777570dde 100644
--- a/autoload/go/rename.vim
+++ b/autoload/go/rename.vim
@@ -72,6 +72,8 @@ function! go#rename#Rename(bang, ...)
   " we need a way to get the list of changes from gorename upon an success
   " change.
   silent execute ":e"
+
+  call go#guru#SameIdRenamed()
 endfunction
 
 " vim: sw=2 ts=2 et