diff --git a/src/normal.c b/src/normal.c
index 86d4504a91..987705d4c6 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -5302,15 +5302,25 @@ handle_tabmenu()
 	    break;
 
 	case TABLINE_MENU_NEW:
-	    vim_snprintf((char *)IObuff, IOSIZE, "%dtabnew",
-				     current_tab > 0 ? current_tab - 1 : 999);
-	    do_cmdline_cmd(IObuff);
+	    if (current_tab == 0)
+		do_cmdline_cmd((char_u *)"$tabnew");
+	    else
+	    {
+		vim_snprintf((char *)IObuff, IOSIZE, "%dtabnew",
+							     current_tab - 1);
+		do_cmdline_cmd(IObuff);
+	    }
 	    break;
 
 	case TABLINE_MENU_OPEN:
-	    vim_snprintf((char *)IObuff, IOSIZE, "browse %dtabnew",
-				     current_tab > 0 ? current_tab - 1 : 999);
-	    do_cmdline_cmd(IObuff);
+	    if (current_tab == 0)
+		do_cmdline_cmd((char_u *)"browse $tabnew");
+	    else
+	    {
+		vim_snprintf((char *)IObuff, IOSIZE, "browse %dtabnew",
+							     current_tab - 1);
+		do_cmdline_cmd(IObuff);
+	    }
 	    break;
     }
 }
diff --git a/src/version.c b/src/version.c
index 3365c806ca..34c6959720 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    641,
 /**/
     640,
 /**/