Index: apps/keymaps/keymap-e200.c
===================================================================
--- apps/keymaps/keymap-e200.c	(revision 14682)
+++ apps/keymaps/keymap-e200.c	(working copy)
@@ -104,6 +104,7 @@
 static const struct button_mapping button_context_list[]  = {
     { ACTION_LISTTREE_PGUP,   BUTTON_REC|BUTTON_SCROLL_UP,   BUTTON_REC },
     { ACTION_LISTTREE_PGDOWN, BUTTON_REC|BUTTON_SCROLL_DOWN, BUTTON_REC },
+    { ACTION_TREE_WPS,    BUTTON_UP|BUTTON_REL,         BUTTON_UP },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_list */
@@ -148,8 +148,7 @@
 static const struct button_mapping button_context_quickscreen[]  = {
     { ACTION_NONE,       BUTTON_LEFT,                   BUTTON_NONE },
     { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL,       BUTTON_NONE },
-    { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REL,          BUTTON_NONE },
-    { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT,       BUTTON_NONE },
+    { ACTION_STD_CANCEL, BUTTON_UP|BUTTON_REL,          BUTTON_NONE },
     { ACTION_QS_DOWN,    BUTTON_DOWN|BUTTON_REL,        BUTTON_NONE },
     { ACTION_QS_DOWN,    BUTTON_DOWN|BUTTON_REPEAT,     BUTTON_NONE },
     { ACTION_QS_LEFT,    BUTTON_LEFT|BUTTON_REL,        BUTTON_NONE },
@@ -200,6 +200,7 @@
     { ACTION_PS_TOGGLE_MODE,    BUTTON_REC,                BUTTON_NONE },
     { ACTION_PS_RESET,          BUTTON_SELECT,             BUTTON_NONE },
     { ACTION_PS_EXIT,           BUTTON_POWER,              BUTTON_NONE },
+    { ACTION_PS_EXIT,           BUTTON_UP,                 BUTTON_NONE },
     
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
 }; /* button_context_pitchscreen */