diff --git a/apps/keymaps/keymap-clip.c b/apps/keymaps/keymap-clip.c
index 917f769890..de5c88a80f 100644
--- a/apps/keymaps/keymap-clip.c
+++ b/apps/keymaps/keymap-clip.c
@@ -212,9 +212,11 @@ static const struct button_mapping button_context_pitchscreen[]  = {
     { ACTION_PS_NUDGE_LEFTOFF,  BUTTON_LEFT|BUTTON_REL,         BUTTON_NONE },
     { ACTION_PS_NUDGE_RIGHT,    BUTTON_RIGHT,                   BUTTON_NONE },
     { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL,        BUTTON_NONE },
-    { ACTION_PS_TOGGLE_MODE,    BUTTON_HOME|BUTTON_REL,         BUTTON_HOME },
-    { ACTION_PS_RESET,          BUTTON_SELECT,                  BUTTON_NONE },
+    { ACTION_PS_TOGGLE_MODE,    BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT },
+    { ACTION_PS_RESET,          BUTTON_HOME|BUTTON_REPEAT,      BUTTON_HOME },
+    { ACTION_PS_RESET,          BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
     { ACTION_PS_EXIT,           BUTTON_POWER,                   BUTTON_NONE },
+    { ACTION_PS_EXIT,           BUTTON_HOME|BUTTON_REL,         BUTTON_HOME },
     { ACTION_PS_SLOWER,         BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_PS_FASTER,         BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
diff --git a/manual/platform/keymap-sansaclip.tex b/manual/platform/keymap-sansaclip.tex
index 83a16135ed..29cb74dcc2 100644
--- a/manual/platform/keymap-sansaclip.tex
+++ b/manual/platform/keymap-sansaclip.tex
@@ -76,15 +76,15 @@
 \newcommand{\ActionKbdPageFlip}{}
 
 %Button actions, Pitch Screen context
-\newcommand{\ActionPsToggleMode}{\ButtonHome}
+\newcommand{\ActionPsToggleMode}{\ButtonSelect}
 \newcommand{\ActionPsIncSmall}{\ButtonUp}
 \newcommand{\ActionPsIncBig}{Long \ButtonUp}
 \newcommand{\ActionPsDecSmall}{\ButtonDown}
 \newcommand{\ActionPsDecBig}{Long \ButtonDown}
 \newcommand{\ActionPsNudgeLeft}{\ButtonLeft}
 \newcommand{\ActionPsNudgeRight}{\ButtonRight}
-\newcommand{\ActionPsReset}{\ButtonSelect}
-\newcommand{\ActionPsExit}{\ButtonPower}
+\newcommand{\ActionPsReset}{Long \ButtonHome or Long \ButtonSelect}
+\newcommand{\ActionPsExit}{\ButtonPower or \ButtonHome}
 
 %Button actions, Recording screen context
 \newcommand{\ActionRecPause}{\ButtonSelect}