diff --git a/src/popupwin.c b/src/popupwin.c
index 13ba639..000bed9 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -541,8 +541,7 @@
 	    wp->w_wincol = wp->w_wantcol - (wp->w_width + extra_width);
     }
 
-    if (wp->w_height <= 1)
-	wp->w_height = wp->w_buffer->b_ml.ml_line_count + wrapped;
+    wp->w_height = wp->w_buffer->b_ml.ml_line_count + wrapped;
     if (wp->w_minheight > 0 && wp->w_height < wp->w_minheight)
 	wp->w_height = wp->w_minheight;
     if (wp->w_maxheight > 0 && wp->w_height > wp->w_maxheight)
@@ -566,11 +565,13 @@
     wp->w_popup_last_changedtick = CHANGEDTICK(wp->w_buffer);
 
     // Need to update popup_mask if the position or size changed.
+    // And redraw windows that were behind the popup.
     if (org_winrow != wp->w_winrow
 	    || org_wincol != wp->w_wincol
 	    || org_width != wp->w_width
 	    || org_height != wp->w_height)
     {
+	// TODO: redraw only windows that were below the popup.
 	redraw_all_later(NOT_VALID);
 	popup_mask_refresh = TRUE;
     }
diff --git a/src/testdir/dumps/Test_popupwin_06.dump b/src/testdir/dumps/Test_popupwin_06.dump
index 3dfcbc2..59a9d0e 100644
--- a/src/testdir/dumps/Test_popupwin_06.dump
+++ b/src/testdir/dumps/Test_popupwin_06.dump
@@ -4,7 +4,7 @@
 |~| @6|o+0#0000001#ffd7ff255|t|h|e|r| |t|a|b| @15| +0#4040ff13#ffffff0@41
 |~| @6|a+0#0000001#ffd7ff255| |c+0#ff404010&|o|m@1|e|n|t| +0#0000001&|l|i|n|e| @10| +0#4040ff13#ffffff0@41
 |~| @6|t+0#0000001#ffd7ff255|h|i|s| |l|i|n|e| |w|i|l@1| |n|o|t| |f|i|t| |h|e| +0#4040ff13#ffffff0@41
-|~| @73
+|~| @6|r+0#0000001#ffd7ff255|e| @22| +0#4040ff13#ffffff0@41
 |~| @73
 |~| @73
 |:+0#0000000&|r|e|d|r|a|w| @49|0|,|0|-|1| @8|A|l@1| 
diff --git a/src/version.c b/src/version.c
index 504a163..132329f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1496,
+/**/
     1495,
 /**/
     1494,