Index: apps/keymaps/keymap-ipod.c
===================================================================
--- apps/keymaps/keymap-ipod.c	(revision 14395)
+++ apps/keymaps/keymap-ipod.c	(working copy)
@@ -154,13 +154,13 @@
     { ACTION_KBD_RIGHT,        BUTTON_RIGHT,                          BUTTON_NONE },
     { ACTION_KBD_RIGHT,        BUTTON_RIGHT|BUTTON_REPEAT,            BUTTON_NONE },
     { ACTION_KBD_SELECT,       BUTTON_SELECT,                         BUTTON_NONE },
-    { ACTION_KBD_DONE,         BUTTON_PLAY,                           BUTTON_NONE },
-    { ACTION_KBD_ABORT,        BUTTON_MENU|BUTTON_REL,                BUTTON_MENU },
-    { ACTION_KBD_UP,           BUTTON_SCROLL_BACK,                    BUTTON_NONE },
-    { ACTION_KBD_UP,           BUTTON_SCROLL_BACK|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_KBD_DOWN,         BUTTON_SCROLL_FWD,                     BUTTON_NONE },
-    { ACTION_KBD_DOWN,         BUTTON_SCROLL_FWD|BUTTON_REPEAT,       BUTTON_NONE },
-    { ACTION_KBD_MORSE_INPUT,  BUTTON_MENU|BUTTON_REPEAT,             BUTTON_MENU },
+    { ACTION_KBD_DONE,         BUTTON_SCROLL_FWD|BUTTON_REPEAT,       BUTTON_SCROLL_FWD },
+    { ACTION_KBD_ABORT,        BUTTON_MENU|BUTTON_SELECT,             BUTTON_NONE },
+    { ACTION_KBD_UP,           BUTTON_MENU,                           BUTTON_NONE },
+    { ACTION_KBD_UP,           BUTTON_MENU|BUTTON_REPEAT,             BUTTON_NONE },
+    { ACTION_KBD_DOWN,         BUTTON_PLAY,                           BUTTON_NONE },
+    { ACTION_KBD_DOWN,         BUTTON_PLAY|BUTTON_REPEAT,             BUTTON_NONE },
+    { ACTION_KBD_MORSE_INPUT,  BUTTON_SCROLL_BACK|BUTTON_REPEAT,      BUTTON_SCROLL_BACK },
     { ACTION_KBD_MORSE_SELECT, BUTTON_SELECT|BUTTON_REL,              BUTTON_NONE },
     LAST_ITEM_IN_LIST
 }; /* button_context_keyboard */