Index: apps/keymaps/keymap-gigabeat.c
===================================================================
--- apps/keymaps/keymap-gigabeat.c	(revision 13492)
+++ apps/keymaps/keymap-gigabeat.c	(working copy)
@@ -66,7 +66,7 @@
 
 
 static const struct button_mapping button_context_wps[]  = {
-    { ACTION_WPS_PLAY,          BUTTON_SELECT|BUTTON_REL,           BUTTON_SELECT },
+    { ACTION_WPS_PLAY,          BUTTON_A|BUTTON_REL,           BUTTON_A },
     { ACTION_WPS_STOP,          BUTTON_POWER|BUTTON_REL,          BUTTON_POWER },
 
     { ACTION_WPS_SKIPNEXT,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT },
@@ -98,7 +98,7 @@
     { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
 
     { ACTION_WPS_ID3SCREEN,     BUTTON_A|BUTTON_MENU,          BUTTON_NONE },
-    { ACTION_WPS_BROWSE,        BUTTON_A|BUTTON_REL,       BUTTON_A },
+    { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_wps */
@@ -305,6 +305,12 @@
     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 },
+    
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
+}; /* button_context_tree */
+
 static const struct button_mapping* get_context_mapping_remote( int context )
 {
     context ^= CONTEXT_REMOTE;
@@ -314,6 +320,9 @@
         case CONTEXT_WPS:
             return remote_button_context_wps;
 
+        case CONTEXT_TREE:
+            return remote_button_context_tree;
+
         default:
             return remote_button_context_standard;
     }