diff --git a/common/content/hints.js b/common/content/hints.js
index 035f8213..95396c66 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -54,6 +54,11 @@ var HintSession = Class("HintSession", CommandMode, {
             this.checkUnique();
     },
 
+    get docs() this._docs = this._docs.filter(({ doc }) => !Cu.isDeadWrapper(doc)),
+    set docs(docs) {
+        this._docs = docs;
+    },
+
     Hint: {
         get active() this._active,
         set active(val) {