diff --git a/ChangeLog b/ChangeLog
index 9224a437..21bffd8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,8 @@ CVS code -
 	  goofy logic setting x pos to value of last line when hitting the
 	  beginning of first line, prog should simply abort.  Added
 	  the #ifdefs around the code in main().
+  main()
+	- Fixed off by one when checking for MAIN_LIST_LEN. Ugh.
 - rcfile.c:
 	- Fix incorrect number of rc options (David Lawrence Ramsey).
 - po/sv.po:
diff --git a/nano.c b/nano.c
index 87d16a53..f0006fb2 100644
--- a/nano.c
+++ b/nano.c
@@ -3115,7 +3115,7 @@ int main(int argc, char *argv[])
 
 	/* Look through the main shortcut list to see if we've hit a
 	   shortcut key */
-	for (i = 0; i < MAIN_LIST_LEN && !keyhandled; i++) {
+	for (i = 0; i < MAIN_LIST_LEN  - 1 && !keyhandled; i++) {
 	    if (kbinput == main_list[i].val ||
 		(main_list[i].misc1 && kbinput == main_list[i].misc1) ||
 		(main_list[i].misc2 && kbinput == main_list[i].misc2)) {
@@ -3167,8 +3167,8 @@ int main(int argc, char *argv[])
 #endif
 #endif
 
-#ifndef NANO_SMALL
 	    case 0:		/* Erg */
+#ifndef NANO_SMALL
 		do_next_word();
 		break;
 #endif