Index: apps/keymaps/keymap-gigabeat.c
===================================================================
--- apps/keymaps/keymap-gigabeat.c	(revision 12955)
+++ apps/keymaps/keymap-gigabeat.c	(working copy)
@@ -51,7 +51,6 @@
     { ACTION_STD_NEXTREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
 
     { ACTION_STD_CANCEL,        BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_STD_CANCEL,        BUTTON_A,                 BUTTON_NONE },
 
     { ACTION_STD_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT },
 
@@ -109,18 +108,14 @@
 
 static const struct button_mapping button_context_tree[]  = {
     { ACTION_TREE_WPS,    BUTTON_POWER|BUTTON_REL,         BUTTON_POWER },
-    { ACTION_TREE_STOP,   BUTTON_A,                   BUTTON_NONE },
     { ACTION_TREE_STOP,   BUTTON_A|BUTTON_REL,        BUTTON_A },
-    { ACTION_TREE_STOP,   BUTTON_A|BUTTON_REPEAT,     BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
 }; /* button_context_tree */
 
 static const struct button_mapping button_context_menu[]  = {
     { ACTION_MENU_WPS,    BUTTON_POWER|BUTTON_REL,    BUTTON_POWER },
-    { ACTION_MENU_STOP,   BUTTON_A,                   BUTTON_NONE },
     { ACTION_MENU_STOP,   BUTTON_A|BUTTON_REL,        BUTTON_A },
-    { ACTION_MENU_STOP,   BUTTON_A|BUTTON_REPEAT,     BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_tree */
Index: firmware/usb.c
===================================================================
--- firmware/usb.c	(revision 12955)
+++ firmware/usb.c	(working copy)
@@ -82,7 +82,7 @@
 #define USBPOWER_BUTTON BUTTON_REC
 #define USBPOWER_BTN_IGNORE BUTTON_ON
 #elif CONFIG_KEYPAD == GIGABEAT_PAD
-#define USBPOWER_BUTTON BUTTON_MENU
+#define USBPOWER_BUTTON BUTTON_A
 #define USBPOWER_BTN_IGNORE BUTTON_POWER
 #elif CONFIG_KEYPAD == IRIVER_H10_PAD
 #define USBPOWER_BUTTON BUTTON_NONE