2 files changed, 23 insertions, 3 deletions

diff --git a/apps/keymaps/keymap-fuzeplus.c b/apps/keymaps/keymap-fuzeplus.c
index 43c50c03b0..042803dd15 100644
--- a/apps/keymaps/keymap-fuzeplus.c
+++ b/apps/keymaps/keymap-fuzeplus.c
@@ -169,11 +169,17 @@ static const struct button_mapping button_context_list[]  = {
 
 #ifdef CONFIG_TUNER
 static const struct button_mapping button_context_radio[]  = {
+
+    { ACTION_FM_MODE,                  BUTTON_SELECT|BUTTON_REL,           BUTTON_SELECT },
     { ACTION_FM_MENU,                  BUTTON_SELECT|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_FM_PRESET,                BUTTON_BOTTOMRIGHT,                 BUTTON_SELECT },
+
     { ACTION_FM_PLAY,                  BUTTON_PLAYPAUSE|BUTTON_REL,        BUTTON_PLAYPAUSE },
     { ACTION_FM_STOP,                  BUTTON_PLAYPAUSE|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_FM_MODE,                  BUTTON_BOTTOMLEFT,                  BUTTON_BOTTOMLEFT },
+
+    { ACTION_FM_PREV_PRESET,           BUTTON_BOTTOMLEFT|BUTTON_REL,       BUTTON_BOTTOMLEFT },
+    { ACTION_FM_NEXT_PRESET,           BUTTON_BOTTOMRIGHT|BUTTON_REL,      BUTTON_BOTTOMRIGHT },
+    { ACTION_FM_PRESET,                BUTTON_BOTTOMRIGHT|BUTTON_REPEAT,   BUTTON_NONE },
+
     { ACTION_SETTINGS_INC,             BUTTON_VOL_UP,                      BUTTON_NONE },
     { ACTION_SETTINGS_INCREPEAT,       BUTTON_VOL_UP|BUTTON_REPEAT,        BUTTON_NONE },
     { ACTION_SETTINGS_DEC,             BUTTON_VOL_DOWN,                    BUTTON_NONE },
@@ -187,7 +193,8 @@ static const struct button_mapping button_context_radio[]  = {
 
 #ifdef HAVE_RECORDING
 static const struct button_mapping button_context_recscreen[]  = {
-    { ACTION_REC_PAUSE,                BUTTON_PLAYPAUSE|BUTTON_REL,        BUTTON_PLAYPAUSE },
+
+    { ACTION_REC_PAUSE,                BUTTON_PLAYPAUSE,                   BUTTON_NONE },
     { ACTION_REC_NEWFILE,              BUTTON_BOTTOMRIGHT,                 BUTTON_NONE },
     { ACTION_SETTINGS_INC,             BUTTON_RIGHT,                       BUTTON_NONE },
     { ACTION_SETTINGS_INCREPEAT,       BUTTON_RIGHT|BUTTON_REPEAT,         BUTTON_NONE },
diff --git a/apps/radio/radio.c b/apps/radio/radio.c
index 4502400677..8a26c5f814 100644
--- a/apps/radio/radio.c
+++ b/apps/radio/radio.c
@@ -137,6 +137,19 @@
 #define FM_PREV_PRESET
 #define FM_NEXT_PRESET
 
+#elif (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD)
+#define FM_PRESET_ADD
+#define FM_PRESET_ACTION
+#define FM_MENU
+#define FM_PRESET
+#define FM_STOP
+#define FM_MODE
+#define FM_EXIT
+#define FM_PLAY
+#define FM_RECORD
+#define FM_PREV_PRESET
+#define FM_NEXT_PRESET
+
 #endif
 
 /* presets.c needs these so keep unstatic or redo the whole thing! */