diff --git a/Changes.txt b/Changes.txt
index b0ac84891..c6489c0d4 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -22,24 +22,28 @@
   * Fixed major bug with joysticks, where mapping was being lost on reset,
     the app would crash when plugging/unplugging certain sticks, etc.
 
-  * Added dialog which shows the joystick database, and the ability to
-    remove (currently unplugged) joysticks from this database.
+  * Added dialog which shows the internal joystick database (all the
+    joysticks that Stella knows about) and the ability to remove
+    (currently unplugged) joysticks from this database.
 
   * Added preliminary support for 'WD' (Wickstead Design) bankswitching
     scheme.
 
-  * The minimum supported version for the OSX port is now OSX 10.7.
-    Because of this, the 32-bit version is also discontinued, as 10.7
-    supports 64-bit Intel only apps.
-
   * The debugger 'reset' command now does a complete system reset,
     instead of simply setting the PC to the reset vector address.
 
+  * The 'listdelay' command now accepts a value of zero, indicating that
+    list-skipping (jumping to a line in a list by keypress) is disabled.
+
   * Added 'Shift-Alt/Shift-Cmd s' keyboard shortcut, to enable continuous
     snapshot mode for each frame.  This is really only useful if you
     save snapshots in 1x mode; using it in high-resolution mode is
     not recommended.  Special thanks to SvOlli for the idea and code.
 
+  * The minimum supported version for the OSX port is now OSX 10.7.
+    Because of this, the 32-bit version is also discontinued, as 10.7
+    supports 64-bit Intel only apps.
+
   * Updated included PNG library to latest stable version.
 
 -Have fun!
diff --git a/docs/graphics/options_misc.png b/docs/graphics/options_misc.png
index dff679190..687bcdbd9 100644
Binary files a/docs/graphics/options_misc.png and b/docs/graphics/options_misc.png differ
diff --git a/docs/index.html b/docs/index.html
index 0caf10af2..57f3bf78d 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -2108,7 +2108,7 @@
       <td><pre>-listdelay &lt;delay&gt;</pre></td>
       <td>Set the amount of time to wait between treating successive
         keypresses as a single word in list widgets (value can range
-        from 300-1000).</td>
+        from 300-1000).  Use '0' to disable list-skipping completely,</td>
     </tr>
 
     <tr>
diff --git a/src/gui/ListWidget.hxx b/src/gui/ListWidget.hxx
index 8caadf012..c1520c40b 100644
--- a/src/gui/ListWidget.hxx
+++ b/src/gui/ListWidget.hxx
@@ -44,7 +44,7 @@ class ListWidget : public EditableWidget
 
   public:
     ListWidget(GuiObject* boss, const GUI::Font& font,
-               int x, int y, int w, int h, bool quickSelect = true);
+               int x, int y, int w, int h, bool quickSelect);
     virtual ~ListWidget();
 
     int rows() const        { return _rows; }
diff --git a/src/gui/StringListWidget.cxx b/src/gui/StringListWidget.cxx
index d35a42d59..f044e8e3d 100644
--- a/src/gui/StringListWidget.cxx
+++ b/src/gui/StringListWidget.cxx
@@ -18,13 +18,15 @@
 //============================================================================
 
 #include "bspf.hxx"
+#include "Settings.hxx"
 #include "ScrollBarWidget.hxx"
 #include "StringListWidget.hxx"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 StringListWidget::StringListWidget(GuiObject* boss, const GUI::Font& font,
                                    int x, int y, int w, int h, bool hilite)
-  : ListWidget(boss, font, x, y, w, h),
+  : ListWidget(boss, font, x, y, w, h,
+               boss->instance().settings().getInt("listdelay") >= 300),
     _hilite(hilite)
 {
 }
diff --git a/src/gui/UIDialog.cxx b/src/gui/UIDialog.cxx
index 2e13d59ef..4f3df091c 100644
--- a/src/gui/UIDialog.cxx
+++ b/src/gui/UIDialog.cxx
@@ -250,6 +250,7 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent,
 
   // Delay between quick-selecting characters in ListWidget
   items.clear();
+  VarList::push_back(items, "Disabled", "0");
   VarList::push_back(items, "300 ms", "300");
   VarList::push_back(items, "400 ms", "400");
   VarList::push_back(items, "500 ms", "500");
@@ -257,9 +258,9 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent,
   VarList::push_back(items, "700 ms", "700");
   VarList::push_back(items, "800 ms", "800");
   VarList::push_back(items, "900 ms", "900");
-  VarList::push_back(items, "1 sec", "1000");
+  VarList::push_back(items, "1 second", "1000");
   myListDelayPopup = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight,
-                                     items, "List quick delay: ", lwidth);
+                                     items, "List quick delay (*): ", lwidth);
   wid.push_back(myListDelayPopup);
   ypos += lineHeight + 4;