diff --git a/docs/index_r77.html b/docs/index_r77.html
index a831fa3a3..6050d1367 100644
--- a/docs/index_r77.html
+++ b/docs/index_r77.html
@@ -80,15 +80,10 @@
       <th width=170px>Action</th>
     </tr>
     <tr>
-      <td>Button 3</td>
+      <td>Button 4</td>
       <td>4:3,16:9</td>
       <td>Open the command dialog</td>
     </tr>
-    <tr>
-      <td>Button 4</td>
-      <td>-</td>
-      <td>Open settings</td>
-    </tr>
     <tr>
       <td>Button 5</td>
       <td>FRY</td>
@@ -97,6 +92,11 @@
     <tr>
       <td>Button 6</td>
       <td>-</td>
+      <td>Open settings</td>
+    </tr>
+    <tr>
+      <td>Button 7</td>
+      <td>-</td>
       <td>Rewind game</td>
     </tr>
     <tr>
diff --git a/src/common/PJoystickHandler.cxx b/src/common/PJoystickHandler.cxx
index 45ea3577b..19d02342e 100644
--- a/src/common/PJoystickHandler.cxx
+++ b/src/common/PJoystickHandler.cxx
@@ -877,10 +877,10 @@ PhysicalJoystickHandler::EventMappingArray PhysicalJoystickHandler::DefaultRight
 PhysicalJoystickHandler::EventMappingArray PhysicalJoystickHandler::DefaultCommonMapping = {
   // valid for all joysticks
 //#if defined(RETRON77)
-  {Event::CmdMenuMode,        2},
-  {Event::OptionsMenuMode,    3},
+  {Event::CmdMenuMode,        3}, // Note: buttons 0..2 are used by controllers!
   {Event::ExitMode,           4},
-  {Event::RewindPause,        5},
+  {Event::OptionsMenuMode,    5},
+  {Event::RewindPause,        6},
   {Event::ConsoleSelect,      7},
   {Event::ConsoleReset,       8},
 //#endif
diff --git a/src/gui/R77HelpDialog.cxx b/src/gui/R77HelpDialog.cxx
index 953705643..3941e1540 100644
--- a/src/gui/R77HelpDialog.cxx
+++ b/src/gui/R77HelpDialog.cxx
@@ -112,10 +112,10 @@ void R77HelpDialog::updateStrings(uInt8 page, uInt8 lines, string& title)
       ADD_BIND();
       ADD_BIND("Joystick", "Console", "Command");
       ADD_LINE();
-      ADD_BIND("\\c2Button 3", "4:3,16:9", "Open command dialog");
-      ADD_BIND("\\c2Button 4", "\\c2-", "Open settings");
+      ADD_BIND("\\c2Button 4", "4:3,16:9", "Open command dialog");
       ADD_BIND("\\c2Button 5", "FRY", "Return to launcher");
-      ADD_BIND("\\c2Button 6", "-", "Rewind game");
+      ADD_BIND("\\c2Button 6", "\\c2-", "Open settings");
+      ADD_BIND("\\c2Button 7", "-", "Rewind game");
       ADD_BIND("\\c2Button 8", "MODE", "Select");
       ADD_BIND("\\c2Button 9", "RESET", "Reset");
       break;