diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index f8e408522..cdb94d15c 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -31,7 +31,7 @@ Added
   terminal
 - New `:messages` command to show error messages
 - New pop-up showing possible keybinding when the first key of a keychain is
-  pressed. This can be turned off using `:set ui show-keyhints false`.
+  pressed. This can be turned off using `:set ui keyhint-blacklist *`.
 
 Changed
 ~~~~~~~
diff --git a/README.asciidoc b/README.asciidoc
index 739cd9f4e..c4cf56252 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -141,8 +141,8 @@ Contributors, sorted by the number of commits in descending order:
 * Daniel Schadt
 * Antoni Boucher
 * Lamar Pavel
-* Bruno Oliveira
 * Ryan Roden-Corrent
+* Bruno Oliveira
 * Alexander Cogneau
 * Felix Van der Jeugt
 * Martin Tournoij
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 8c8edd39a..2a2a2dc42 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -49,7 +49,7 @@
 |<<ui-hide-mouse-cursor,hide-mouse-cursor>>|Whether to hide the mouse cursor.
 |<<ui-modal-js-dialog,modal-js-dialog>>|Use standard JavaScript modal dialog for alert() and confirm()
 |<<ui-hide-wayland-decoration,hide-wayland-decoration>>|Hide the window decoration when using wayland (requires restart)
-|<<ui-show-keyhints,show-keyhints>>|Show possible keychains based on the current keystring
+|<<ui-keyhint-blacklist,keyhint-blacklist>>|Keychains that shouldn't be shown in the keyhint dialog
 |==============
 
 .Quick reference for section ``network''
@@ -671,16 +671,13 @@ Valid values:
 
 Default: +pass:[false]+
 
-[[ui-show-keyhints]]
-=== show-keyhints
-Show possible keychains based on the current keystring
+[[ui-keyhint-blacklist]]
+=== keyhint-blacklist
+Keychains that shouldn't be shown in the keyhint dialog
 
-Valid values:
+Globs are supported, so ';*' will blacklist all keychainsstarting with ';'. Use '*' to disable keyhints
 
- * +true+
- * +false+
-
-Default: +pass:[true]+
+Default: empty
 
 == network
 Settings related to the network.