diff --git a/src/popupmenu.c b/src/popupmenu.c
index 6298b5c..ea2edca 100644
--- a/src/popupmenu.c
+++ b/src/popupmenu.c
@@ -917,7 +917,7 @@
 {
     int	    resized = FALSE;
     int	    context = pum_height / 2;
-    int	    scroll_offset = pum_selected - pum_height;
+    int	    scroll_offset;
 #ifdef FEAT_QUICKFIX
     int	    prev_selected = pum_selected;
     unsigned	cur_cot_flags = get_cot_flags();
@@ -927,6 +927,7 @@
 #endif
 
     pum_selected = n;
+    scroll_offset = pum_selected - pum_height;
 
     if (pum_selected >= 0 && pum_selected < pum_size)
     {
@@ -950,7 +951,7 @@
 	    // scroll up; when we did a jump it's probably a PageDown then
 	    // scroll a whole page
 	    if (pum_first < scroll_offset + 3)
-		pum_first = MAX(pum_first, scroll_offset + 1);
+		pum_first = MAX(pum_first + pum_height - 2, scroll_offset + 1);
 	    else
 		pum_first = scroll_offset + 1;
 	}