diff --git a/src/screen.c b/src/screen.c
index cba7e0b..a5b77e2 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -3395,9 +3395,14 @@
     if (invalid)
 	wp->w_lines_valid = 0;
 
+    // with only a few lines it's not worth the effort
     if (wp->w_height < 5)
 	return FAIL;
 
+    // with the popup menu visible this might not work correctly
+    if (pum_visible())
+	return FAIL;
+
     if (line_count > wp->w_height - row)
 	line_count = wp->w_height - row;
 
diff --git a/src/version.c b/src/version.c
index 66129bd..9b2fd4e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    5144,
+/**/
     5143,
 /**/
     5142,