diff --git a/src/popupmnu.c b/src/popupmnu.c
index bef9dd5ef8..9dce37848b 100644
--- a/src/popupmnu.c
+++ b/src/popupmnu.c
@@ -640,7 +640,7 @@ pum_set_selected(n, repeat)
 
 		    curbuf->b_changed = 0;
 		    curbuf->b_p_ma = FALSE;
-		    curwin->w_cursor.lnum = 0;
+		    curwin->w_cursor.lnum = 1;
 		    curwin->w_cursor.col = 0;
 
 		    if (curwin != curwin_save && win_valid(curwin_save))
diff --git a/src/version.c b/src/version.c
index ba75f61acd..939a11093a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    396,
 /**/
     395,
 /**/