diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c
index 8ca0c56831..a6fd289cd2 100644
--- a/apps/keymaps/keymap-ipod.c
+++ b/apps/keymaps/keymap-ipod.c
@@ -155,14 +155,15 @@ static const struct button_mapping button_context_keyboard[]  = {
     { ACTION_KBD_LEFT,         BUTTON_LEFT|BUTTON_REPEAT,             BUTTON_NONE },   
     { ACTION_KBD_RIGHT,        BUTTON_RIGHT,                          BUTTON_NONE },
     { ACTION_KBD_RIGHT,        BUTTON_RIGHT|BUTTON_REPEAT,            BUTTON_NONE },
-    { ACTION_KBD_SELECT,       BUTTON_SELECT|BUTTON_REL,              BUTTON_SELECT },
-    { ACTION_KBD_DONE,         BUTTON_SELECT|BUTTON_REPEAT,           BUTTON_NONE },
-    { ACTION_KBD_ABORT,        BUTTON_MENU,                           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_MORSE_SELECT, BUTTON_SELECT|BUTTON_REL,              BUTTON_NONE },
     LAST_ITEM_IN_LIST
 }; /* button_context_keyboard */
 
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c
index 7dcec7c8cc..58bc179b64 100644
--- a/apps/recorder/keyboard.c
+++ b/apps/recorder/keyboard.c
@@ -54,6 +54,7 @@
 
 #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD)
 #define KBD_MODES /* iPod uses 2 modes, picker and line edit */
+#define KBD_MORSE_INPUT
 
 #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
 #define KBD_MODES /* iFP7xx uses 2 modes, picker and line edit */