diff --git a/src/screen.c b/src/screen.c
index 0d65b4b..86ebd40 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -464,7 +464,8 @@
     // First char of a popup window may go on top of the right half of a
     // double-wide character. Clear the left half to avoid it getting the popup
     // window background color.
-    if (coloff > 0 && ScreenLines[off_to] == 0)
+    if (coloff > 0 && ScreenLines[off_to] == 0
+					     && ScreenLinesUC[off_to - 1] != 0)
     {
 	ScreenLines[off_to - 1] = ' ';
 	ScreenLinesUC[off_to - 1] = 0;
diff --git a/src/version.c b/src/version.c
index 26075ce..1cdd69a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1509,
+/**/
     1508,
 /**/
     1507,