diff --git a/src/popupmnu.c b/src/popupmnu.c
index 5248217..0f920dc 100644
--- a/src/popupmnu.c
+++ b/src/popupmnu.c
@@ -141,8 +141,8 @@
 	if (p_ph > 0 && pum_height > p_ph)
 	    pum_height = p_ph;
 
-	/* Put the pum below "pum_win_row" if possible.  If there are few lines decide
-	 * on where there is more room. */
+	/* Put the pum below "pum_win_row" if possible.  If there are few lines
+	 * decide on where there is more room. */
 	if (pum_win_row + 2 >= below_row - pum_height
 		      && pum_win_row - above_row > (below_row - above_row) / 2)
 	{
@@ -196,11 +196,20 @@
 	    return;
 
 #if defined(FEAT_QUICKFIX)
-	/* If there is a preview window at the above avoid drawing over it. */
-	if (pvwin != NULL && pum_row < above_row && pum_height > above_row)
+	// If there is a preview window at the above avoid drawing over it.
+	// Do keep at least 10 entries.
+	if (pvwin != NULL && pum_row < above_row && pum_height > 10)
 	{
-	    pum_row += above_row;
-	    pum_height -= above_row;
+	    if (pum_win_row - above_row < 10)
+	    {
+		pum_row = pum_win_row - 10;
+		pum_height = 10;
+	    }
+	    else
+	    {
+		pum_row = above_row;
+		pum_height = pum_win_row - above_row;
+	    }
 	}
 #endif
 
diff --git a/src/version.c b/src/version.c
index 480d20e..26825b9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    355,
+/**/
     354,
 /**/
     353,