diff --git a/common/content/hints.js b/common/content/hints.js
index 2fcba8e2..9e1739ec 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -65,20 +65,19 @@ function Hints() //{{{
     function extended() options.extendedhinttags;
     const hintModes = {
         ";": Mode("Focus hint",                        function (elem) buffer.focusElement(elem),                             extended),
+        "?": Mode("Show information for hint",         function (elem) buffer.showElementInfo(elem),                          extended),
+        s: Mode("Save hint",                           function (elem) buffer.saveLink(elem, true)),
         a: Mode("Save hint with prompt",               function (elem) buffer.saveLink(elem, false)),
         f: Mode("Focus frame",                         function (elem) elem.ownerDocument.defaultView.focus(), function () "//body | //xhtml:body"),
-        s: Mode("Save hint",                           function (elem) buffer.saveLink(elem, true)),
         o: Mode("Follow hint",                         function (elem) buffer.followLink(elem, liberator.CURRENT_TAB)),
         t: Mode("Follow hint in a new tab",            function (elem) buffer.followLink(elem, liberator.NEW_TAB)),
         b: Mode("Follow hint in a background tab",     function (elem) buffer.followLink(elem, liberator.NEW_BACKGROUND_TAB)),
+        w: Mode("Follow hint in a new window",         function (elem) buffer.followLink(elem, liberator.NEW_WINDOW),         extended),
+        O: Mode("Preselect hint in an :open query",    function (elem, loc) commandline.open(":", "open " + loc, modes.EX)),
+        T: Mode("Preselect hint in a :tabopen query",  function (elem, loc) commandline.open(":", "tabopen " + loc, modes.EX)),
+        W: Mode("Preselect hint in a :winopen query",  function (elem, loc) commandline.open(":", "winopen " + loc, modes.EX)),
         v: Mode("View hint source",                    function (elem, loc) buffer.viewSource(loc, false),                    extended),
         V: Mode("View hint source in external editor", function (elem, loc) buffer.viewSource(loc, true),                     extended),
-        w: Mode("Follow hint in a new window",         function (elem) buffer.followLink(elem, liberator.NEW_WINDOW),         extended),
-
-        "?": Mode("Show information for hint",         function (elem) buffer.showElementInfo(elem),                          extended),
-        O: Mode("Open location based on hint",         function (elem, loc) commandline.open(":", "open " + loc, modes.EX)),
-        T: Mode("Open new tab based on hint",          function (elem, loc) commandline.open(":", "tabopen " + loc, modes.EX)),
-        W: Mode("Open new window based on hint",       function (elem, loc) commandline.open(":", "winopen " + loc, modes.EX)),
         y: Mode("Yank hint location",                  function (elem, loc) util.copyToClipboard(loc, true)),
         Y: Mode("Yank hint description",               function (elem) util.copyToClipboard(elem.textContent || "", true),    extended)
     };
diff --git a/vimperator/locale/en-US/hints.txt b/vimperator/locale/en-US/hints.txt
index 533dba68..1cee993c 100644
--- a/vimperator/locale/en-US/hints.txt
+++ b/vimperator/locale/en-US/hints.txt
@@ -41,18 +41,18 @@ this hint mode. Then press [a]24[a] to copy the hint location.
 
 * |;;| [m];[m] to focus a link and hover it with the mouse
 * |;?| [m]?[m] to show information about the element (incomplete)
+* |;s| [m]s[m] to save its destination
 * |;a| [m]a[m] to save its destination (prompting for save location)
 * |;f| [m]f[m] to focus a frame
-* |;s| [m]s[m] to save its destination
 * |;o| [m]o[m] to open its location in the current tab
 * |;t| [m]t[m] to open its location in a new tab
 * |;b| [m]b[m] to open its location in a new background tab
-* |;O| [m]O[m] to open its location in an [c]:open[c] query
-* |;T| [m]T[m] to open its location in a [c]:tabopen[c] query
+* |;w| [m]w[m] to open its destination in a new window
+* |;O| [m]O[m] to preselect its location in an [c]:open[c] query
+* |;T| [m]T[m] to preselect its location in a [c]:tabopen[c] query
+* |;W| [m]W[m] to preselect its location in a [c]:winopen[c] query
 * |;v| [m]v[m] to view its destination source
 * |;V| [m]V[m] to view its destination source in the external editor
-* |;w| [m]w[m] to open its destination in a new window
-* |;W| [m]W[m] to open its location in a [c]:winopen[c] query
 * |;y| [m]y[m] to yank its destination location
 * |;Y| [m]Y[m] to yank its text description