diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c
index 199524e6af..ad981c71d4 100644
--- a/apps/keymaps/keymap-ipod.c
+++ b/apps/keymaps/keymap-ipod.c
@@ -195,20 +195,24 @@ const struct button_mapping button_context_recscreen[]  = {
 
 #ifdef USB_ENABLE_HID
 static const struct button_mapping button_context_usb_hid[] = {
-    { ACTION_USB_HID_INC,         BUTTON_SCROLL_FWD,                BUTTON_NONE },
-    { ACTION_USB_HID_INC,         BUTTON_SCROLL_FWD|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_USB_HID_DEC,         BUTTON_SCROLL_BACK,               BUTTON_NONE },
-    { ACTION_USB_HID_DEC,         BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_USB_HID_START,       BUTTON_PLAY|BUTTON_REL,           BUTTON_PLAY },
-    { ACTION_USB_HID_QUIT,        BUTTON_PLAY|BUTTON_REPEAT,        BUTTON_PLAY },
-    { ACTION_USB_HID_LEFT,        BUTTON_LEFT|BUTTON_REL,           BUTTON_LEFT },
-    { ACTION_USB_HID_LEFT_LONG,   BUTTON_LEFT|BUTTON_REPEAT,        BUTTON_LEFT },
-    { ACTION_USB_HID_RIGHT,       BUTTON_RIGHT|BUTTON_REL,          BUTTON_RIGHT },
-    { ACTION_USB_HID_RIGHT_LONG,  BUTTON_RIGHT|BUTTON_REPEAT,       BUTTON_RIGHT },
-    { ACTION_USB_HID_SELECT,      BUTTON_SELECT|BUTTON_REL,         BUTTON_SELECT },
-    { ACTION_USB_HID_SELECT_LONG, BUTTON_SELECT|BUTTON_REPEAT,      BUTTON_SELECT },
-    { ACTION_USB_HID_MENU,        BUTTON_MENU|BUTTON_REL,           BUTTON_MENU },
-    { ACTION_USB_HID_MODE,        BUTTON_MENU|BUTTON_REPEAT,        BUTTON_MENU },
+    { ACTION_USB_HID_INC,         BUTTON_SCROLL_FWD,                        BUTTON_NONE },
+    { ACTION_USB_HID_INC,         BUTTON_SCROLL_FWD|BUTTON_REPEAT,          BUTTON_NONE },
+    { ACTION_USB_HID_DEC,         BUTTON_SCROLL_BACK,                       BUTTON_NONE },
+    { ACTION_USB_HID_DEC,         BUTTON_SCROLL_BACK|BUTTON_REPEAT,         BUTTON_NONE },
+    { ACTION_USB_HID_START,       BUTTON_PLAY|BUTTON_REL,                   BUTTON_PLAY },
+    { ACTION_USB_HID_QUIT,        BUTTON_PLAY|BUTTON_REPEAT,                BUTTON_PLAY },
+    { ACTION_USB_HID_LEFT,        BUTTON_LEFT|BUTTON_REL,                   BUTTON_LEFT },
+    { ACTION_USB_HID_LEFT_LONG,   BUTTON_LEFT|BUTTON_REPEAT,                BUTTON_LEFT },
+    { ACTION_USB_HID_RIGHT,       BUTTON_RIGHT|BUTTON_REL,                  BUTTON_RIGHT },
+    { ACTION_USB_HID_RIGHT_LONG,  BUTTON_RIGHT|BUTTON_REPEAT,               BUTTON_RIGHT },
+    { ACTION_USB_HID_SELECT,      BUTTON_SELECT|BUTTON_REL,                 BUTTON_SELECT },
+    { ACTION_USB_HID_SELECT_LONG, BUTTON_SELECT|BUTTON_REPEAT,              BUTTON_SELECT },
+    { ACTION_USB_HID_MENU,        BUTTON_MENU|BUTTON_REL,                   BUTTON_MENU },
+    { ACTION_USB_HID_MENU_LONG,   BUTTON_MENU|BUTTON_REPEAT,                BUTTON_MENU },
+    { ACTION_USB_HID_MODE,        BUTTON_SELECT|BUTTON_RIGHT|BUTTON_REL,    BUTTON_SELECT|BUTTON_RIGHT },
+    { ACTION_USB_HID_MODE,        BUTTON_SELECT|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_SELECT|BUTTON_RIGHT },
+    { ACTION_USB_HID_MODE_LONG,   BUTTON_SELECT|BUTTON_LEFT|BUTTON_REL,     BUTTON_SELECT|BUTTON_LEFT },
+    { ACTION_USB_HID_MODE_LONG,   BUTTON_SELECT|BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_SELECT|BUTTON_LEFT },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_usb_hid */
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index 029de1f71f..854fadaf0f 100644
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -190,18 +190,19 @@ this option \setting{On}. If it is not required, then turning this setting
     keypad mode.  There are different modes which provide different
     functionality.
     \opt{SANSA_E200_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD%
-        ,MROBE100_PAD}{%
+        ,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD}{%
     Switching modes back and forth is done by pressing the
         \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec} %
         \opt{GIGABEAT_S_PAD,SANSA_CLIP_PAD,MROBE100_PAD}{\ButtonPower} %
+        \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonSelect+\ButtonRight} %
     and %
         \opt{SANSA_E200_PAD,SANSA_C200_PAD}{Long \ButtonRec} %
         \opt{GIGABEAT_S_PAD,SANSA_CLIP_PAD,MROBE100_PAD}{Long \ButtonPower} %
+        \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonSelect+\ButtonLeft} %
     keys, respectively.%
     }%
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,IRIVER_H10_PAD}{%
+    \opt{IRIVER_H10_PAD}{%
     Switching modes is done by pressing the
-        \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{\ButtonMenu} %
         \opt{IRIVER_H10_PAD}{Long \ButtonPower} %
     key.%
     }%
@@ -334,7 +335,8 @@ this option \setting{On}. If it is not required, then turning this setting
             % Screen white
             \opt{SANSA_E200_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}
               {Long \ButtonDown}
-            \opt{MROBE100_PAD}{Long \ButtonMenu}
+            \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD,MROBE100_PAD}
+              {Long \ButtonMenu}
             \opt{HAVEREMOTEKEYMAP}{& }
             & White screen \\
             %