2 files changed, 7 insertions, 3 deletions

diff --git a/apps/keymaps/keymap-clip.c b/apps/keymaps/keymap-clip.c
index 942968b20f..d871ea4f6c 100644
--- a/apps/keymaps/keymap-clip.c
+++ b/apps/keymaps/keymap-clip.c
@@ -76,8 +76,12 @@ static const struct button_mapping button_context_wps[]  = {
 
     { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,     BUTTON_SELECT },
     { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,  BUTTON_SELECT },
-    
+
+#ifndef HAS_BUTTON_HOLD /* Clip+ */
+    { ACTION_WPS_QUICKSCREEN,   BUTTON_HOME|BUTTON_SELECT,    BUTTON_HOME },
+#else
     { ACTION_WPS_QUICKSCREEN,   BUTTON_HOME|BUTTON_REPEAT,    BUTTON_HOME },
+#endif
     { ACTION_WPS_MENU,          BUTTON_HOME|BUTTON_REL,      BUTTON_HOME },
 
     { ACTION_WPS_PITCHSCREEN,   BUTTON_SELECT|BUTTON_UP,        BUTTON_SELECT },
@@ -89,7 +93,7 @@ static const struct button_mapping button_context_wps[]  = {
 #endif
 
 #ifndef HAS_BUTTON_HOLD /* Clip+ */
-    { ACTION_STD_KEYLOCK,       BUTTON_HOME|BUTTON_SELECT,      BUTTON_NONE },
+    { ACTION_STD_KEYLOCK,       BUTTON_HOME|BUTTON_REPEAT,      BUTTON_HOME },
 #endif /* HAS_BUTTON_HOLD */
 
     LAST_ITEM_IN_LIST
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index 7f666a5d87..c0d74a2ac9 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -110,7 +110,7 @@ your WPS (While Playing Screen).
           \opt{RECORDER_PAD}{\ButtonFOne+\ButtonDown}
           \opt{PLAYER_PAD}{\ButtonMenu+\ButtonStop}
           \opt{ONDIO_PAD}{\ButtonMenu+\ButtonDown}
-          \opt{SANSA_CLIP_PAD}{\ButtonHome+\ButtonSelect}
+          \opt{SANSA_CLIP_PAD}{Long \ButtonHome}
           & Key lock on/off.\\
       }%
       %These actions need definitions for the other targets