diff --git a/apps/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c
index 748b56d23d..1c11f3f917 100644
--- a/apps/keymaps/keymap-e200.c
+++ b/apps/keymaps/keymap-e200.c
@@ -201,6 +201,7 @@ static const struct button_mapping button_context_pitchscreen[]  = {
     { 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 */
diff --git a/manual/platform/e200.tex b/manual/platform/e200.tex
index 52646b1a59..664794376e 100644
--- a/manual/platform/e200.tex
+++ b/manual/platform/e200.tex
@@ -101,14 +101,14 @@
 
 %Button actions, Pitch Screen context
 \newcommand{\ActionPsToggleMode}{\ButtonRec}
-\newcommand{\ActionPsIncSmall}{\ButtonUp}
-\newcommand{\ActionPsIncBig}{Long \ButtonUp}
-\newcommand{\ActionPsDecSmall}{\ButtonDown}
-\newcommand{\ActionPsDecBig}{Long \ButtonDown}
+\newcommand{\ActionPsIncSmall}{\ButtonScrollUp}
+\newcommand{\ActionPsIncBig}{Long \ButtonScrollUp}
+\newcommand{\ActionPsDecSmall}{\ButtonScrollDown}
+\newcommand{\ActionPsDecBig}{Long \ButtonScrollDown}
 \newcommand{\ActionPsNudgeLeft}{\ButtonLeft}
 \newcommand{\ActionPsNudgeRight}{\ButtonRight}
 \newcommand{\ActionPsReset}{\ButtonSelect}
-\newcommand{\ActionPsExit}{\ButtonPower}
+\newcommand{\ActionPsExit}{\ButtonPower{} or \ButtonUp}
 
 %Button actions, Recording screen context
 \newcommand{\ActionRecPause}{\ButtonUp}