diff --git a/src/misc1.c b/src/misc1.c
index 7ef7e78..f5549fd 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -1447,9 +1447,9 @@
     i = get_number(TRUE, mouse_used);
     if (KeyTyped)
     {
-	/* don't call wait_return() now */
-	/* msg_putchar('\n'); */
-	cmdline_row = msg_row - 1;
+	// don't call wait_return() now
+	if (msg_row > 0)
+	    cmdline_row = msg_row - 1;
 	need_wait_return = FALSE;
 	msg_didany = FALSE;
 	msg_didout = FALSE;
diff --git a/src/version.c b/src/version.c
index 1156fd6..b392cfd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1509,
+/**/
     1508,
 /**/
     1507,