diff --git a/src/popupmnu.c b/src/popupmnu.c
index bef9dd5..9dce378 100644
--- a/src/popupmnu.c
+++ b/src/popupmnu.c
@@ -640,7 +640,7 @@
 
 		    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 ba75f61..939a110 100644
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    396,
+/**/
     395,
 /**/
     394,