diff --git a/common/content/hints.js b/common/content/hints.js
index e92b83b0..2b12f880 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -621,10 +621,10 @@ var HintSession = Class("HintSession", CommandMode, {
         return Events.KILL;
     },
 
-    updateValidNumbers: function updateValidNumbers() {
+    updateValidNumbers: function updateValidNumbers(always) {
         let string = this.getHintString(this.hintNumber);
         for (let hint in values(this.validHints))
-            hint.valid = hint.span.getAttribute("number").indexOf(string) == 0;
+            hint.valid = always || hint.span.getAttribute("number").indexOf(string) == 0;
     },
 
     tab: function tab(previous) {
@@ -643,6 +643,7 @@ var HintSession = Class("HintSession", CommandMode, {
                 this.hintNumber = this.validHints.length;
         }
 
+        this.updateValidNumbers(true);
         this.showActiveHint(this.hintNumber, oldId);
         this.updateStatusline();
     },
diff --git a/common/modules/storage.jsm b/common/modules/storage.jsm
index 4af8d929..b41e86cf 100644
--- a/common/modules/storage.jsm
+++ b/common/modules/storage.jsm
@@ -305,7 +305,7 @@ var File = Class("File", {
                 return File.DoesNotExist(path, e);
             }
         }
-        let self = XPCSafeJSObjectWrapper(file);
+        let self = XPCSafeJSObjectWrapper(file.QueryInterface(Ci.nsILocalFile));
         self.__proto__ = this;
         return self;
     },