diff --git a/src/ChangeLog b/src/ChangeLog
index 503f0c8e300..46fef8b9285 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* dispnew.c (scrolling_window): Before scrolling, turn off a
+	mouse-highlight in the window being scrolled.
+
 2011-06-16  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* nsmenu.m: Replace all uses of XVECTOR with ASIZE and AREF.  (Bug#8839)
diff --git a/src/dispnew.c b/src/dispnew.c
index 4c460abd636..d2878a4fa57 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -5206,6 +5206,7 @@ scrolling_window (w, header_line_p)
 	/* Copy on the display.  */
 	if (r->current_y != r->desired_y)
 	  {
+	    rif->clear_window_mouse_face (w);
 	    rif->scroll_run_hook (w, r);
 
 	    /* Invalidate runs that copy from where we copied to.  */