2 files changed, 4 insertions, 0 deletions
diff --git a/src/macterm.c b/src/macterm.c
index e18f3ee48a0..c41e1f0ffed 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -4193,6 +4193,8 @@ note_mouse_movement (frame, pos)
       /* Remember which glyph we're now on.  */
       remember_mouse_glyph (frame, pos->h, pos->v, &last_mouse_glyph);
     }
+  else
+    help_echo_string = previous_help_echo_string;
 }
 
 
diff --git a/src/w32term.c b/src/w32term.c
index 96d26344b53..b6349eb63a1 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -3238,6 +3238,8 @@ note_mouse_movement (frame, msg)
 	 other times.  */
       remember_mouse_glyph (frame, mouse_x, mouse_y, &last_mouse_glyph);
     }
+  else
+    help_echo_string = previous_help_echo_string;
 }