diff --git a/apps/keymaps/keymap-hm801.c b/apps/keymaps/keymap-hm801.c
index db286e2879..b69656a3f1 100644
--- a/apps/keymaps/keymap-hm801.c
+++ b/apps/keymaps/keymap-hm801.c
@@ -42,6 +42,7 @@ static const struct button_mapping button_context_standard[] = {
     { ACTION_STD_CANCEL,     BUTTON_LEFT,                  BUTTON_NONE },
     { ACTION_STD_OK,         BUTTON_SELECT|BUTTON_REL,     BUTTON_SELECT },
     { ACTION_STD_MENU,       BUTTON_POWER|BUTTON_REL,      BUTTON_POWER },
+    { ACTION_STD_MENU,       BUTTON_RIGHT|BUTTON_REL,      BUTTON_RIGHT },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_standard */
@@ -49,12 +50,22 @@ static const struct button_mapping button_context_standard[] = {
 static const struct button_mapping button_context_wps[] = {
     { ACTION_WPS_PLAY,      BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },
     { ACTION_WPS_STOP,      BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_PLAY },
+    { ACTION_WPS_PLAY,      BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT },
+    { ACTION_WPS_STOP,      BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
+
     { ACTION_WPS_SKIPPREV,  BUTTON_PREV|BUTTON_REL,         BUTTON_PREV },
     { ACTION_WPS_SEEKBACK,  BUTTON_PREV|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_WPS_STOPSEEK,  BUTTON_PREV|BUTTON_REL,         BUTTON_PREV|BUTTON_REPEAT },
+    { ACTION_WPS_SKIPPREV,  BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT },
+    { ACTION_WPS_SEEKBACK,  BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_WPS_STOPSEEK,  BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT|BUTTON_REPEAT },
+
     { ACTION_WPS_SKIPNEXT,  BUTTON_NEXT|BUTTON_REL,         BUTTON_NEXT},
     { ACTION_WPS_SEEKFWD,   BUTTON_NEXT|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_WPS_STOPSEEK,  BUTTON_NEXT|BUTTON_REL,         BUTTON_NEXT|BUTTON_REPEAT },
+    { ACTION_WPS_SKIPNEXT,  BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT},
+    { ACTION_WPS_SEEKFWD,   BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_WPS_STOPSEEK,  BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT|BUTTON_REPEAT },
 
     { ACTION_WPS_ABSETB_NEXTDIR,   BUTTON_POWER|BUTTON_PREV,       BUTTON_POWER },
     { ACTION_WPS_ABSETA_PREVDIR,   BUTTON_POWER|BUTTON_NEXT,       BUTTON_POWER },
@@ -64,12 +75,11 @@ static const struct button_mapping button_context_wps[] = {
     { ACTION_WPS_CONTEXT,          BUTTON_UP|BUTTON_REPEAT,        BUTTON_UP    },
     { ACTION_WPS_MENU,             BUTTON_DOWN|BUTTON_REL,         BUTTON_DOWN  },
     { ACTION_WPS_QUICKSCREEN,      BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_DOWN  },
-    { ACTION_WPS_PITCHSCREEN,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT  },
-    { ACTION_WPS_ID3SCREEN,        BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_LEFT  },
-    { ACTION_WPS_LIST_BOOKMARKS,   BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT},
-    { ACTION_WPS_CREATE_BOOKMARK,  BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT},
-    { ACTION_WPS_HOTKEY,           BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT },
-    { ACTION_WPS_VIEW_PLAYLIST,    BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_RIGHT },
+    { ACTION_WPS_PITCHSCREEN,      BUTTON_POWER|BUTTON_LEFT,       BUTTON_POWER },
+    { ACTION_WPS_ID3SCREEN,        BUTTON_POWER|BUTTON_RIGHT,      BUTTON_POWER },
+    { ACTION_WPS_LIST_BOOKMARKS,   BUTTON_POWER|BUTTON_SELECT,     BUTTON_POWER },
+    { ACTION_WPS_CREATE_BOOKMARK,  BUTTON_POWER|BUTTON_DOWN,       BUTTON_POWER },
+    { ACTION_WPS_VIEW_PLAYLIST,    BUTTON_POWER|BUTTON_PLAY,       BUTTON_POWER },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_wps */
@@ -172,7 +182,7 @@ static const struct button_mapping button_context_settings_r_is_inc[] = {
 /** Tree **/
 static const struct button_mapping button_context_tree[] = {
     { ACTION_TREE_WPS,    BUTTON_PLAY|BUTTON_REL,        BUTTON_PLAY },
-    { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REL,       BUTTON_POWER},
+    { ACTION_TREE_STOP,   BUTTON_PLAY|BUTTON_REPEAT,     BUTTON_NONE },
     { ACTION_TREE_HOTKEY, BUTTON_NEXT,                   BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)