diff --git a/misc/emacs/go-mode.el b/misc/emacs/go-mode.el
index 6f5d97aa496..feba035ee50 100644
--- a/misc/emacs/go-mode.el
+++ b/misc/emacs/go-mode.el
@@ -436,7 +436,7 @@ functions, and some types.  It also provides indentation that is
   ;; Remove stale text properties
   (save-restriction
     (widen)
-    (remove-list-of-text-properties 1 (buffer-size)
+    (remove-list-of-text-properties 1 (+ (buffer-size) 1)
                                     '(go-mode-cs go-mode-nesting)))
 
   ;; Reset the syntax mark caches