diff --git a/src/screen.c b/src/screen.c
index fb10853277..512560b885 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -9345,7 +9345,7 @@ give_up:
     TabPageIdxs = new_TabPageIdxs;
 #ifdef FEAT_TEXT_PROP
     popup_mask = new_popup_mask;
-    vim_memset(popup_mask, 0, screen_Rows * screen_Columns * sizeof(short));
+    vim_memset(popup_mask, 0, Rows * Columns * sizeof(short));
     popup_mask_refresh = TRUE;
 #endif
 
diff --git a/src/version.c b/src/version.c
index ed8fba056e..504a1631c0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1495,
 /**/
     1494,
 /**/