1 files changed, 4 insertions, 2 deletions

diff --git a/src/dispnew.c b/src/dispnew.c
index 7841ffac76a..489c7c647e1 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -4398,8 +4398,10 @@ update_text_area (w, vpos)
          mouse-face areas after scrolling and other operations.
          However, it causes excessive flickering when mouse is moved
          across the mode line.  Luckily, turning it off for the mode
-         line doesn't seem to hurt anything. -- cyd.  */
-      || (current_row->mouse_face_p && !current_row->mode_line_p)
+         line doesn't seem to hurt anything. -- cyd.
+         But it is still needed for the header line. -- kfs.  */
+      || (current_row->mouse_face_p
+          && !(current_row->mode_line_p && vpos > 0))
       || current_row->x != desired_row->x)
     {
       rif->cursor_to (vpos, 0, desired_row->y, desired_row->x);