diff --git a/src/popupwin.c b/src/popupwin.c
index aa8bba088f..b9526c7ff9 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -2154,8 +2154,9 @@ update_popups(void (*win_update)(win_T *wp))
 	wp->w_winrow += top_off;
 	wp->w_wincol += left_off;
 
-	// Draw the popup text.
-	win_update(wp);
+	// Draw the popup text, unless it's off screen.
+	if (wp->w_winrow < screen_Rows && wp->w_wincol < screen_Columns)
+	    win_update(wp);
 
 	wp->w_winrow -= top_off;
 	wp->w_wincol -= left_off;
diff --git a/src/version.c b/src/version.c
index 0631f09b22..fa4e50dea3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1596,
 /**/
     1595,
 /**/