diff --git a/ChangeLog b/ChangeLog
index 30d48460..f9ac666a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-31 Chris Allegretta <chrisa@asty.org>
+	* global.c: Fix for Savannah bug #23442: left/right arrow keys 
+	  do not work with --enable-tiny (by Mike Frysinger)
+
 2008-05-31 Chris Allegretta <chrisa@asty.org>
 	* files.c,proto.h,text.c: Fix for conflicts with AIX curses
 	  variables, from William Jojo <jojowil@hvcc.edu>
diff --git a/src/global.c b/src/global.c
index 675f30e6..9896a325 100644
--- a/src/global.c
+++ b/src/global.c
@@ -1056,12 +1056,12 @@ void shortcut_init(bool unjustify)
     add_to_sclist(MMAIN, "M-}", do_indent_void, 0, TRUE);
     add_to_sclist(MMAIN, "M-{", do_unindent, 0, TRUE);
     add_to_sclist(MALL, "^F", do_right, 0, TRUE);
-    add_to_sclist(MALL, "kright", do_right, 0, TRUE);
     add_to_sclist(MALL, "^B", do_left, 0, TRUE);
-    add_to_sclist(MALL, "kleft", do_left, 0, TRUE);
     add_to_sclist(MMAIN, "^Space", do_next_word_void, 0, TRUE);
     add_to_sclist(MMAIN, "M-Space", do_prev_word_void, 0, TRUE);
 #endif
+    add_to_sclist(MALL, "kright", do_right, 0, TRUE);
+    add_to_sclist(MALL, "kleft", do_left, 0, TRUE);
     add_to_sclist(MMAIN, "^Q", xon_complaint, 0, TRUE);
     add_to_sclist(MMAIN, "^S", xoff_complaint, 0, TRUE);
     add_to_sclist(MALL, "^P", do_up_void, 0, TRUE);