diff --git a/docs/index.html b/docs/index.html
index c9d7a2553..16ea512a7 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -2261,30 +2261,25 @@
       <th>Key (macOS)</th>
     </tr>
     <tr>
-      <td>Open context-sensitive help</td>
-      <td>F1</td>
-      <td>Shift-Cmd + ?</td>
+      <td>Go to initial directory (also in other file dialogs)</td>
+      <td>Alt + Home</td>
+      <td>Alt + Home</td>
+    </tr>
+    <tr>
+      <td>Go to previous directory in history (also in other file dialogs)</td>
+      <td>Alt + Left arrow</td>
+      <td>Alt + Left arrow</td>
+    </tr>
+    <tr>
+      <td>Go to next directory in history (also in other file dialogs)</td>
+      <td>Alt + Right arrow</td>
+      <td>Alt + Right arrow</td>
     </tr>
     <tr>
       <td>Go to parent directory (also in other file dialogs)</td>
       <td>Backspace, Alt + Up arrow</td>
       <td>Backspace, Alt + Up arrow</td>
     </tr>
-    <tr>
-      <td>Go to home directory</td>
-      <td>Alt + Home</td>
-      <td>Alt + Home</td>
-    </tr>
-    <tr>
-      <td>Go to previous directory in history</td>
-      <td>Alt + Left arrow</td>
-      <td>Alt + Left arrow</td>
-    </tr>
-    <tr>
-      <td>Go to next directory in history</td>
-      <td>Alt + Right arrow</td>
-      <td>Alt + Right arrow</td>
-    </tr>
     <tr>
       <td>Remove from 'Recently Played' or 'Most Popular' folder</td>
       <td>Control + X</td>
@@ -2321,7 +2316,7 @@
       <td>Control + A</td>
     </tr>
     <tr>
-      <td>Toggle favorites sorting</td>
+      <td>Toggle favorites sorting (normal or alternative)</td>
       <td>Control + S</td>
       <td>Control + S</td>
     </tr>
@@ -3280,6 +3275,11 @@
       <td>Set the size of the font in the ROM launcher.</td>
     </tr>
 
+    <tr>
+      <td><pre>-launcherbuttons &lt;1|0&gt;</pre></td>
+      <td>Enable bottom buttons in the ROM launcher.</td>
+    </tr>
+
     <tr>
       <td><pre>-launcherroms &lt;1|0&gt;</pre></td>
       <td>Specifies whether to show ROMs only (the default) or all
@@ -3298,13 +3298,18 @@
     </tr>
 
     <tr>
-      <td><pre>-altsorting &lt;1|0&gt;</pre></td>
-      <td>Alternative sorting in virtual folders.</td>
+      <td><pre>-favorites &lt;1|0&gt;</pre></td>
+      <td>Enable favorites tracking and display.</td>
     </tr>
 
     <tr>
-      <td><pre>-maxrecentroms &lt;1|0&gt;</pre></td>
-      <td>Number of ROMs tracked in 'Recently Played' folder.</td>
+      <td><pre>-altsorting &lt;1|0&gt;</pre></td>
+      <td>Use alternative sorting in virtual favorites folders.</td>
+    </tr>
+
+    <tr>
+      <td><pre>-maxrecentroms &lt;number&gt;</pre></td>
+      <td>Set number of ROMs tracked in 'Recently Played' folder (default = 20).</td>
     </tr>
 
     <tr>
diff --git a/docs/index_r77.html b/docs/index_r77.html
index 12d9d7475..e238e16d0 100644
--- a/docs/index_r77.html
+++ b/docs/index_r77.html
@@ -77,7 +77,7 @@
     <tr>
       <th width=110px>Joystick</th>
       <th width=100px>Button</th>
-      <th width=170px>Action</th>
+      <th width=200px>Action</th>
     </tr>
     <tr>
       <td>Button 4</td>
@@ -119,7 +119,7 @@
     <tr>
       <th width=110px>Joystick</th>
       <th width=100px>Button</th>
-      <th width=170px>Action</th>
+      <th width=200px>Action</th>
     </tr>
     <tr>
       <td>Up</td>
@@ -147,10 +147,25 @@
       <td>Start selected game</td>
     </tr>
     <tr>
-      <td>Button 2 or</br>hold Button 1</td>
+      <td>Hold Button 1</td>
+      <td>-</td>
+      <td>Open a context menu with the following choices:
+        <ul>
+         <li>Add to favorites</li>
+         <li>Power-On options...</li>
+         <li>Go to initial directory</li>
+         <li>Go to parent directory</li>
+         <li><a href="#Settings">Settings...</a></li>
+        </ul>
+        Button 2 or 6 close the menu without any action.
+      </td>
+    </tr>
+    <tr>
+      <td>Button 2</td>
       <td>SKILL P2</td>
       <td>Open Power-On options</td>
     </tr>
+
     <tr>
       <td>Button 4</td>
       <td>COLOR, B/W</td>
@@ -166,7 +181,7 @@
     <tr>
       <th width=110px>Joystick</th>
       <th width=100px>Button</th>
-      <th width=170px>Action</th>
+      <th width=200px>Action</th>
     </tr>
     <tr>
       <td>Up</td>
diff --git a/src/gui/ContextMenu.cxx b/src/gui/ContextMenu.cxx
index 42fae421d..7fbe4e721 100644
--- a/src/gui/ContextMenu.cxx
+++ b/src/gui/ContextMenu.cxx
@@ -331,6 +331,7 @@ void ContextMenu::handleEvent(Event::Type e)
       moveToLast();
       break;
     case Event::UICancel:
+    case Event::UIOK:
       close();
       break;
     default:
diff --git a/src/gui/LauncherDialog.cxx b/src/gui/LauncherDialog.cxx
index 8a21beaea..16911b6ea 100644
--- a/src/gui/LauncherDialog.cxx
+++ b/src/gui/LauncherDialog.cxx
@@ -1152,12 +1152,14 @@ void LauncherDialog::openContextMenu(int x, int y)
       ? "Show all files"
       : "Show only ROMs", "showall"));
   #endif
-    items.push_back(ContextItem("Go to home directory", "homedir"));
+    items.push_back(ContextItem("Go to initial directory", "homedir"));
     items.push_back(ContextItem("Go to parent directory", "prevdir"));
   #ifndef RETRON77
     items.push_back(ContextItem("Reload listing", "reload"));
-  #endif
     items.push_back(ContextItem("Options" + ELLIPSIS, "options"));
+  #else
+    items.push_back(ContextItem("Settings" + ELLIPSIS, "options"));
+  #endif
   }
   else
   {