diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 9c98b23cf28..cdb743c1494 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -425,8 +425,8 @@ and:
 	(progn
 	  (whitespace-check-buffer-list (buffer-name) buffer-file-name)
 	  (whitespace-tickle-timer)
-	  (remove-overlays nil nil 'face 'whitespace-highlight)
 	  (overlay-recenter (point-max))
+	  (remove-overlays nil nil 'face 'whitespace-highlight)
 	  (if whitespace-auto-cleanup
 	      (if buffer-read-only
 		  (if (not quiet)