diff --git a/apps/keymaps/keymap-agptekrocker.c b/apps/keymaps/keymap-agptekrocker.c
index aa7c687ce4..1c13239bea 100644
--- a/apps/keymaps/keymap-agptekrocker.c
+++ b/apps/keymaps/keymap-agptekrocker.c
@@ -54,6 +54,12 @@ static const struct button_mapping button_context_standard[]  = {
 }; /* button_context_standard */
 
 
+static const struct button_mapping button_context_mainmenu[]  = {
+    { ACTION_TREE_WPS,       BUTTON_POWER,                  BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_TREE),
+}; /* button_context_mainmenu as with sansa clip mapping - "back" button returns you to WPS */
+
 static const struct button_mapping button_context_wps[]  = {
 /*    { ACTION_WPS_BROWSE,        BUTTON_UP|BUTTON_REPEAT,  BUTTON_UP }, */
     { ACTION_WPS_PLAY,        BUTTON_SELECT|BUTTON_REL,     BUTTON_SELECT },
@@ -223,6 +229,7 @@ const struct button_mapping* get_context_mapping(int context)
             return button_context_wps;
 
         case CONTEXT_MAINMENU:
+            return button_context_mainmenu;
         case CONTEXT_TREE:
         case CONTEXT_LIST:
             return button_context_list;
diff --git a/docs/CREDITS b/docs/CREDITS
index 5bf01f50db..fd598a4127 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -690,6 +690,7 @@ Johannes König
 Alexander Drammen
 Kei Miyamoto
 James D. Smith
+Howard Richardson
 
 The libmad team
 The wavpack team