diff --git a/src/xdisp.c b/src/xdisp.c
index 6d30afda6d8..5ae8fc1cf6b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -20578,7 +20578,7 @@ highlight_trailing_whitespace (struct it *it)
       else
 	{
 	  while (glyph <= start
-		 && glyph->type == CHAR_GLYPH
+		 && (glyph->type == CHAR_GLYPH || glyph->type == STRETCH_GLYPH)
 		 && NILP (glyph->object))
 	    ++glyph;
 	}