diff --git a/apps/keymaps/keymap-gigabeat.c b/apps/keymaps/keymap-gigabeat.c
index 465d16a85e..5fbbecc674 100644
--- a/apps/keymaps/keymap-gigabeat.c
+++ b/apps/keymaps/keymap-gigabeat.c
@@ -278,6 +278,7 @@ static const struct button_mapping remote_button_context_standard[]  = {
     { ACTION_STD_NEXTREPEAT,  BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
     { ACTION_STD_CANCEL,      BUTTON_RC_REW,                    BUTTON_NONE },
     { ACTION_STD_OK,          BUTTON_RC_FF,                     BUTTON_NONE },
+    { ACTION_STD_MENU,        BUTTON_RC_DSP,                    BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
 };
@@ -293,7 +294,8 @@ static const struct button_mapping remote_button_context_wps[]  = {
     { ACTION_WPS_STOPSEEK,  BUTTON_RC_REW|BUTTON_REL,          BUTTON_RC_REW|BUTTON_REPEAT },
     { ACTION_WPS_STOPSEEK,  BUTTON_RC_FF|BUTTON_REL,           BUTTON_RC_FF|BUTTON_REPEAT },
 
-    { ACTION_WPS_STOP,      BUTTON_RC_DSP,                     BUTTON_NONE },
+    { ACTION_WPS_STOP,      BUTTON_RC_PLAY|BUTTON_REPEAT,      BUTTON_RC_PLAY },
+    { ACTION_WPS_MENU,      BUTTON_RC_DSP,                     BUTTON_NONE },
 
     { ACTION_WPS_VOLDOWN,   BUTTON_RC_VOL_DOWN,                BUTTON_NONE },
     { ACTION_WPS_VOLDOWN,   BUTTON_RC_VOL_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
@@ -303,6 +305,13 @@ static const struct button_mapping remote_button_context_wps[]  = {
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 };
 
+static const struct button_mapping remote_button_context_tree[]  = {
+    { ACTION_TREE_WPS,    BUTTON_RC_PLAY|BUTTON_REL,           BUTTON_RC_PLAY },
+    { ACTION_TREE_STOP,   BUTTON_RC_PLAY|BUTTON_REPEAT,        BUTTON_RC_PLAY },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+};
+
 static const struct button_mapping* get_context_mapping_remote( int context )
 {
     context ^= CONTEXT_REMOTE;
@@ -311,10 +320,11 @@ static const struct button_mapping* get_context_mapping_remote( int context )
     {
         case CONTEXT_WPS:
             return remote_button_context_wps;
-
-        default:
-            return remote_button_context_standard;
+        case CONTEXT_MAINMENU:
+        case CONTEXT_TREE:
+            return remote_button_context_tree;
     }
+    return remote_button_context_standard;
 }
 
 const struct button_mapping* get_context_mapping(int context)