diff --git a/common/content/hints.js b/common/content/hints.js
index 20638960..4e718393 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -470,7 +470,7 @@ const Hints = Module("hints", {
 
         this.timeout(function () {
             if (modes.extended & modes.HINTS)
-                modes.reset();
+                modes.pop();
             this._hintMode.action(elem, elem.href || "", this._extendedhintCount);
         }, timeout);
         return true;
@@ -763,7 +763,7 @@ const Hints = Module("hints", {
 
         if (this._validHints.length == 0) {
             dactyl.beep();
-            modes.reset();
+            modes.pop();
         }
         else if (this._validHints.length == 1)
             this._processHints(false);
@@ -833,8 +833,8 @@ const Hints = Module("hints", {
 
        case mappings.getMapLeader():
            hints.escNumbers = !hints.escNumbers;
-           if (hints.escNumbers && this._usedTabKey) // this._hintNumber not used normally, but someone may wants to toggle
-               this._hintNumber = 0;                 // <tab>s ? this._reset. Prevent to show numbers not entered.
+           if (hints.escNumbers && this._usedTabKey)
+               this._hintNumber = 0;
 
            this._updateStatusline();
            return;
diff --git a/pentadactyl/TODO b/pentadactyl/TODO
index 19ea7b43..043e3f26 100644
--- a/pentadactyl/TODO
+++ b/pentadactyl/TODO
@@ -36,7 +36,6 @@ BUGS:
   bookmark - they're being set after the observer triggers the autocmd event.
 - :messages is _very_ slow for message history of several thousand lines ->
   Unresponsive Script: util.js:79 (sometimes xmlToDom() and elsewhere)
-- The MOW shouldn't close when executing hints and ;F isn't working.
 
 FEATURES:
 9 Add quoting help tag