diff --git a/apps/keymaps/keymap-rgnano.c b/apps/keymaps/keymap-rgnano.c
index b66bd92d64..6ed71bccb1 100644
--- a/apps/keymaps/keymap-rgnano.c
+++ b/apps/keymaps/keymap-rgnano.c
@@ -47,6 +47,7 @@ static const struct button_mapping button_context_standard[]  = {
     { ACTION_STD_MENU,          BUTTON_Y|BUTTON_REL,        BUTTON_Y },
     { ACTION_STD_CONTEXT,       BUTTON_START|BUTTON_REL,    BUTTON_START },
     { ACTION_STD_QUICKSCREEN,   BUTTON_R|BUTTON_REL,        BUTTON_R },
+    { ACTION_STD_KEYLOCK,       BUTTON_FN|BUTTON_START,     BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_standard */
@@ -76,6 +77,7 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_ABSETB_NEXTDIR,    BUTTON_A|BUTTON_RIGHT,          BUTTON_A },
     { ACTION_WPS_ABRESET,           BUTTON_A|BUTTON_UP,             BUTTON_A },
     { ACTION_WPS_ABRESET,           BUTTON_A|BUTTON_DOWN,           BUTTON_A },
+    { ACTION_STD_KEYLOCK,           BUTTON_FN|BUTTON_START,         BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_wps */
@@ -223,7 +225,7 @@ static const struct button_mapping button_context_radio[]  = {
 
 const struct button_mapping* get_context_mapping(int context)
 {
-    switch (context)
+    switch (context & ~CONTEXT_LOCKED)
     {
         case CONTEXT_STD:
             return button_context_standard;
diff --git a/firmware/export/config/rgnano.h b/firmware/export/config/rgnano.h
index b1a18c723d..e2a8ddc824 100644
--- a/firmware/export/config/rgnano.h
+++ b/firmware/export/config/rgnano.h
@@ -45,7 +45,6 @@
 
 /* define this to indicate your device's keypad */
 #define HAVE_BUTTON_DATA
-#define HAS_BUTTON_HOLD
 #define HAVE_VOLUME_IN_LIST
 
 /* define this if you have a real-time clock */
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index d81435cd90..fe88197a64 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -85,8 +85,6 @@ your WPS (While Playing Screen).
           \opt{RG_NANO_PAD}{\ButtonStart+\ButtonFN}
           & Key lock (software hold switch) on/off.\\
       }%
-      \opt{RG_NANO_PAD}{\ButtonStart+\ButtonFN}
-      & Key lock (software hold switch) on/off.\\
       % We explicitly list all the appropriate targets here and do no condition
       % on the 'pitchscreen' feature since some players have the feature but do
       % not have the button to go from the WPS to the pitch screen.
diff --git a/packaging/rgnano/mapping.key b/packaging/rgnano/mapping.key
index 75d1b39fd3..10ed8bf50a 100644
--- a/packaging/rgnano/mapping.key
+++ b/packaging/rgnano/mapping.key
@@ -2,4 +2,3 @@ UNMAP         FN+Y
 UNMAP         FN+A
 UNMAP         FN+B
 UNMAP         FN+X
-MAP START+FN  TO KEY      KEY_H