2 files changed, 3 insertions, 2 deletions

diff --git a/src/w32term.c b/src/w32term.c
index c81945e3e04..7201455e1ff 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -4985,7 +4985,8 @@ x_draw_bar_cursor (w, row, width, kind)
           w32_fill_area (f, hdc, cursor_color, x,
                          WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y +
                                                   row->height - width),
-                         cursor_glyph->pixel_width, width);
+                         min (FRAME_COLUMN_WIDTH (f), cursor_glyph->pixel_width),
+                         width);
         }
 
       w32_set_clip_rectangle (hdc, NULL);
diff --git a/src/xterm.c b/src/xterm.c
index f272c934043..264f2c21363 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7441,7 +7441,7 @@ x_draw_bar_cursor (w, row, width, kind)
                           WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x),
                           WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y +
                                                    row->height - width),
-                          cursor_glyph->pixel_width,
+                          min (FRAME_COLUMN_WIDTH (f), cursor_glyph->pixel_width),
                           width);
 
       XSetClipMask (dpy, gc, None);