diff --git a/src/drawline.c b/src/drawline.c
index 1907022..d71c73d 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -2993,7 +2993,11 @@
 	// Don't use "extra_attr" until n_attr_skip is zero.
 	if (n_attr_skip == 0 && n_attr > 0
 		&& wlv.draw_state == WL_LINE
-		&& (!attr_pri || (text_prop_flags & PT_FLAG_OVERRIDE)))
+		&& (!attr_pri
+#ifdef FEAT_PROP_POPUP
+		    || (text_prop_flags & PT_FLAG_OVERRIDE)
+#endif
+		   ))
 	{
 #ifdef LINE_ATTR
 	    if (line_attr)
diff --git a/src/version.c b/src/version.c
index 00afb67..65afaf6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    209,
+/**/
     208,
 /**/
     207,