1 files changed, 9 insertions, 0 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index e4b5dec7959..3cebb17cd9e 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13538,6 +13538,15 @@ try_window (window, pos, check_margins)
   struct window *w = XWINDOW (window);
   struct it it;
   struct glyph_row *last_text_row = NULL;
+  struct frame *f = XFRAME (w->frame);
+
+  /* Clear any existing mouse-face highlights.  */
+  if (FRAME_WINDOW_P (f))
+    {
+      update_begin (f);
+      rif->clear_window_mouse_face (w);
+      update_end (f);
+    }
 
   /* Make POS the new window start.  */
   set_marker_both (w->start, Qnil, CHARPOS (pos), BYTEPOS (pos));