diff --git a/apps/keymaps/keymap-cowond2.c b/apps/keymaps/keymap-cowond2.c
index 594a68f4a4..8067fe47d0 100644
--- a/apps/keymaps/keymap-cowond2.c
+++ b/apps/keymaps/keymap-cowond2.c
@@ -72,6 +72,7 @@ static const struct button_mapping button_context_list[]  = {
 
 static const struct button_mapping button_context_tree[]  = {
     { ACTION_TREE_WPS,  BUTTON_PLUS|BUTTON_MENU,    BUTTON_PLUS },
+    { ACTION_TREE_WPS,   BUTTON_PLUS|BUTTON_MENU,   BUTTON_PLUS|BUTTON_REPEAT },
     { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL,    BUTTON_POWER },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
 }; /* button_context_tree */
@@ -151,12 +152,8 @@ static const struct button_mapping button_context_keyboard[]  = {
 }; /* button_context_keyboard */
 
 static const struct button_mapping button_context_radio[]  = {
-    { ACTION_STD_PREV,       BUTTON_MINUS,                      BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT, BUTTON_MINUS|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_STD_NEXT,       BUTTON_PLUS,                       BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT, BUTTON_PLUS|BUTTON_REPEAT,         BUTTON_NONE },
-    { ACTION_FM_MENU,        BUTTON_MENU|BUTTON_REPEAT,         BUTTON_NONE },
-    { ACTION_FM_PRESET,      BUTTON_MENU|BUTTON_REL,            BUTTON_NONE },
+    { ACTION_FM_MENU,        BUTTON_MENU|BUTTON_REL,            BUTTON_NONE },
+    { ACTION_FM_PRESET,      BUTTON_MENU|BUTTON_REPEAT,         BUTTON_NONE },
     { ACTION_FM_STOP,        BUTTON_POWER,                      BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)