diff --git a/apps/keymaps/keymap-gigabeat.c b/apps/keymaps/keymap-gigabeat.c
index 1917714b1e..37b00b0ad0 100644
--- a/apps/keymaps/keymap-gigabeat.c
+++ b/apps/keymaps/keymap-gigabeat.c
@@ -253,12 +253,14 @@ static const struct button_mapping button_context_keyboard[]  = {
     { ACTION_KBD_PAGE_FLIP,    BUTTON_POWER|BUTTON_MENU,                BUTTON_NONE },
     { ACTION_KBD_DONE,         BUTTON_POWER|BUTTON_REL,                 BUTTON_POWER },
     { ACTION_KBD_ABORT,        BUTTON_A,                                BUTTON_NONE },
-    { ACTION_KBD_BACKSPACE,    BUTTON_MENU,                             BUTTON_NONE },
+    { ACTION_KBD_BACKSPACE,    BUTTON_MENU|BUTTON_REL,                  BUTTON_MENU },
     { ACTION_KBD_BACKSPACE,    BUTTON_MENU|BUTTON_REPEAT,               BUTTON_NONE },
     { ACTION_KBD_UP,           BUTTON_UP,                               BUTTON_NONE },
     { ACTION_KBD_UP,           BUTTON_UP|BUTTON_REPEAT,                 BUTTON_NONE },
     { ACTION_KBD_DOWN,         BUTTON_DOWN,                             BUTTON_NONE },
     { ACTION_KBD_DOWN,         BUTTON_DOWN|BUTTON_REPEAT,               BUTTON_NONE },
+    { ACTION_KBD_MORSE_INPUT,  BUTTON_MENU|BUTTON_SELECT,               BUTTON_NONE },
+    { 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 52aaf9a19c..30523253b4 100644
--- a/apps/recorder/keyboard.c
+++ b/apps/recorder/keyboard.c
@@ -65,6 +65,9 @@
 #elif CONFIG_KEYPAD == IRIVER_H10_PAD
 #define KBD_MODES /* iriver H10 uses 2 modes, picker and line edit */
 #define KBD_MORSE_INPUT
+
+#elif CONFIG_KEYPAD == GIGABEAT_PAD
+#define KBD_MORSE_INPUT
 #endif
 
 struct keyboard_parameters {