diff --git a/src/popupwin.c b/src/popupwin.c
index e49a863488..1d8356ccf8 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -4414,7 +4414,7 @@ draw_opacity_padding_cell(
 
 	    // Prefer current screen state for detecting a wide char, since the
 	    // saved data may not contain a reliable right-half marker.
-	    if (base_off >= 0 && ScreenLines != NULL)
+	    if (base_off >= 0)
 	    {
 		if (ScreenLinesUC != NULL
 			&& ScreenLinesUC[base_off] != 0
diff --git a/src/version.c b/src/version.c
index d001aa53fd..e4cec84002 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    86,
 /**/
     85,
 /**/