1 files changed, 2 insertions, 8 deletions

diff --git a/apps/keymaps/keymap-gigabeat-s.c b/apps/keymaps/keymap-gigabeat-s.c
index 343d6b4f9c..5f16d1b292 100644
--- a/apps/keymaps/keymap-gigabeat-s.c
+++ b/apps/keymaps/keymap-gigabeat-s.c
@@ -100,17 +100,13 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_VOLUP,          BUTTON_VOL_UP,                 BUTTON_NONE },
 
     { ACTION_WPS_PITCHSCREEN,    BUTTON_BACK|BUTTON_UP,         BUTTON_BACK },
-#ifdef HAVE_HOTKEY
-    { ACTION_WPS_HOTKEY,         BUTTON_BACK|BUTTON_DOWN,       BUTTON_NONE },
-#else
     { ACTION_WPS_VIEW_PLAYLIST,  BUTTON_BACK|BUTTON_DOWN,       BUTTON_NONE },
-#endif
 
     { ACTION_WPS_QUICKSCREEN,    BUTTON_MENU|BUTTON_REPEAT,     BUTTON_MENU },
     { ACTION_WPS_MENU,           BUTTON_MENU|BUTTON_REL,        BUTTON_MENU },
     { ACTION_WPS_CONTEXT,        BUTTON_SELECT|BUTTON_REPEAT,   BUTTON_SELECT },
 
-    { ACTION_WPS_ID3SCREEN,      BUTTON_BACK|BUTTON_MENU,       BUTTON_NONE },
+    { ACTION_WPS_HOTKEY,         BUTTON_BACK|BUTTON_MENU,       BUTTON_NONE },
     { ACTION_WPS_BROWSE,         BUTTON_SELECT|BUTTON_REL,      BUTTON_SELECT },
 
     LAST_ITEM_IN_LIST
@@ -138,9 +134,7 @@ static const struct button_mapping button_context_tree[]  = {
     { ACTION_TREE_STOP, BUTTON_POWER,               BUTTON_NONE },
     { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL,    BUTTON_POWER },
     { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE },
-#ifdef HAVE_HOTKEY
-//    { ACTION_TREE_HOTKEY,BUTTON_NONE,               BUTTON_NONE },
-#endif
+    { ACTION_TREE_HOTKEY,BUTTON_BACK|BUTTON_MENU,   BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
 }; /* button_context_tree */