1 files changed, 2 insertions, 1 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 2a0f783580e..7f0c0b5aba2 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2653,7 +2653,8 @@ x_draw_glyph_string (s)
       int width;
       struct glyph_string *next;
 
-      for (width = 0, next = s->next; next;
+      for (width = 0, next = s->next;
+           next && width < s->right_overhang;
            width += next->width, next = next->next)
         if (next->first_glyph->type != IMAGE_GLYPH)
           {