diff --git a/src/screen.c b/src/screen.c
index 76d9b3c..0a93f86 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -7897,7 +7897,11 @@
 		|| ScreenAttrs[off] != attr
 		|| exmode_active;
 
-	if (need_redraw || force_redraw_this)
+	if ((need_redraw || force_redraw_this)
+#ifdef FEAT_TEXT_PROP
+		&& popup_mask[row * screen_Columns + col] <= screen_zindex
+#endif
+	   )
 	{
 #if defined(FEAT_GUI) || defined(UNIX)
 	    /* The bold trick makes a single row of pixels appear in the next