diff --git a/src/ChangeLog b/src/ChangeLog
index d117bc2bfba..c05845cef71 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-29  Eli Zaretskii  <eliz@gnu.org>
+
+	* xdisp.c (clear_mouse_face): Don't invalidate the entire
+	mouse-highlight info, just signal frame_up_to_date_hook that mouse
+	highlight needs to be redisplayed.  (Bug#15913)
+
 2013-11-29  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Fix minor problems found by static checking.
diff --git a/src/xdisp.c b/src/xdisp.c
index 6357f4f5f3b..509780b50d1 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -26883,7 +26883,10 @@ clear_mouse_face (Mouse_HLInfo *hlinfo)
       cleared = 1;
     }
 
-  reset_mouse_highlight (hlinfo);
+  hlinfo->mouse_face_beg_row = hlinfo->mouse_face_beg_col = -1;
+  hlinfo->mouse_face_end_row = hlinfo->mouse_face_end_col = -1;
+  hlinfo->mouse_face_window = Qnil;
+  hlinfo->mouse_face_overlay = Qnil;
   return cleared;
 }