diff --git a/common/content/hints.js b/common/content/hints.js
index d349ce58..cf877078 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -575,7 +575,7 @@ function Hints() //{{{
         function (count)
         {
             extendedhintCount = count;
-            commandline.input(";", function (arg) { setTimeout(function () hints.show(arg), 0); },
+            commandline.input(";", null,
                 {
                     promptHighlight: "Normal",
                     completer: function (context)
@@ -583,7 +583,8 @@ function Hints() //{{{
                         context.compare = function () 0;
                         context.completions = [[k, v.prompt] for ([k, v] in Iterator(hintModes))];
                     },
-                    onChange: function () { modes.pop() }
+                    onChange: function () { modes.pop() },
+                    onCancel: function (arg) { arg && setTimeout(function () hints.show(arg), 0); },
                 });
         }, { flags: Mappings.flags.COUNT });