1 files changed, 6 insertions, 1 deletions

diff --git a/src/w32term.c b/src/w32term.c
index 8a007602dd2..edb4263a0ff 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -5040,7 +5040,12 @@ x_draw_glyphs (w, x, row, area, start, end, hl, overlaps_p)
   for (s = head; s; s = s->next)
     x_draw_glyph_string (s);
 
-  if (area == TEXT_AREA && !row->full_width_p)
+  if (area == TEXT_AREA
+      && !row->full_width_p
+      /* When drawing overlapping rows, only the glyph strings'
+         foreground is drawn, which doesn't erase a cursor
+         completely. */
+      && !overlaps_p)
     {
       int x0 = head ? head->x : x;
       int x1 = tail ? tail->x + tail->background_width : x;