diff --git a/src/screen.c b/src/screen.c
index 55437e1..72b346d 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -8645,10 +8645,16 @@
 	}
 	/* Use the last line of the screen for the current line. */
 	current_ScreenLine = new_ScreenLines + Rows * Columns;
+
+#ifdef FEAT_TEXT_PROP
+	vim_memset(new_popup_mask, 0, Rows * Columns * sizeof(short));
+	vim_memset(new_popup_transparent, 0, Rows * Columns * sizeof(char));
+#endif
     }
 
     free_screenlines();
 
+    // NOTE: this may result in all pointers to become NULL.
     ScreenLines = new_ScreenLines;
     ScreenLinesUC = new_ScreenLinesUC;
     for (i = 0; i < p_mco; ++i)
@@ -8661,10 +8667,8 @@
     TabPageIdxs = new_TabPageIdxs;
 #ifdef FEAT_TEXT_PROP
     popup_mask = new_popup_mask;
-    vim_memset(popup_mask, 0, Rows * Columns * sizeof(short));
     popup_mask_next = new_popup_mask_next;
     popup_transparent = new_popup_transparent;
-    vim_memset(popup_transparent, 0, Rows * Columns * sizeof(char));
     popup_mask_refresh = TRUE;
 #endif
 
diff --git a/src/version.c b/src/version.c
index f998c52..71f6c34 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1845,
+/**/
     1844,
 /**/
     1843,