diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 7169a24b7..21fcfb461 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -71,6 +71,9 @@ Changed
 - The `:buffer` completion now also filters using the first column (id).
 - `:undo` has been improved to reopen tabs at the position they were closed.
 - `:navigate` now takes a count for `up`/`increment`/`decrement`.
+- The `hints -> auto-follow` setting now can be set to
+  `always`/`full-match`/`unique-match`/`never` to more precisely control when
+  hints should be followed automatically.
 
 Deprecated
 ~~~~~~~~~~
diff --git a/README.asciidoc b/README.asciidoc
index 420c5cc21..7a1510e29 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -142,10 +142,10 @@ Contributors, sorted by the number of commits in descending order:
 * Florian Bruhin
 * Daniel Schadt
 * Ryan Roden-Corrent
+* Jakub Klinkovský
 * Antoni Boucher
 * Lamar Pavel
 * Bruno Oliveira
-* Jakub Klinkovský
 * Jan Verbeek
 * Alexander Cogneau
 * Marshall Lochbaum
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index cef74eb0e..08d0dd51e 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -185,7 +185,7 @@
 |<<hints-scatter,scatter>>|Whether to scatter hint key chains (like Vimium) or not (like dwb). Ignored for number hints.
 |<<hints-uppercase,uppercase>>|Make chars in hint strings uppercase.
 |<<hints-dictionary,dictionary>>|The dictionary file to be used by the word hints.
-|<<hints-auto-follow,auto-follow>>|Follow a hint immediately when the hint text is completely matched.
+|<<hints-auto-follow,auto-follow>>|Controls when a hint can be automatically followed without the user pressing Enter.
 |<<hints-auto-follow-timeout,auto-follow-timeout>>|A timeout (in milliseconds) to inhibit normal-mode key bindings after a successful auto-follow.
 |<<hints-next-regexes,next-regexes>>|A comma-separated list of regexes to use for 'next' links.
 |<<hints-prev-regexes,prev-regexes>>|A comma-separated list of regexes to use for 'prev' links.
@@ -1660,14 +1660,16 @@ Default: +pass:[/usr/share/dict/words]+
 
 [[hints-auto-follow]]
 === auto-follow
-Follow a hint immediately when the hint text is completely matched.
+Controls when a hint can be automatically followed without the user pressing Enter.
 
 Valid values:
 
- * +true+
- * +false+
+ * +always+: Auto-follow whenever there is only a single hint on a page.
+ * +unique-match+: Auto-follow whenever there is a unique non-empty match in either the hint string (word mode) or filter (number mode).
+ * +full-match+: Follow the hint when the user typed the whole hint (letter, word or number mode) or the element's text (only in number mode).
+ * +never+: The user will always need to press Enter to follow a hint.
 
-Default: +pass:[true]+
+Default: +pass:[unique-match]+
 
 [[hints-auto-follow-timeout]]
 === auto-follow-timeout