diff --git a/common/content/hints.js b/common/content/hints.js
index c9865990..812ff1f7 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -38,6 +38,9 @@ const Hints = Module("hints", {
                 self._showHints();
             }
         });
+        let appContent = document.getElementById("appcontent");
+        if (appContent)
+            events.addSessionListener(appContent, "scroll", this._resizeTimer.closure.tell, false);
 
         const Mode = Hints.Mode;
         Mode.defaultValue("tags", function () function () options["hinttags"]);
@@ -91,8 +94,10 @@ const Hints = Module("hints", {
         this._activeTimeout = null;
     },
     __reset: function () {
-        if (!this._usedTabKey)
+        if (!this._usedTabKey) {
             this._hintNumber = 0;
+            this._updateStatusline();
+        }
     },
 
     /**
@@ -480,7 +485,7 @@ const Hints = Module("hints", {
             this._removeHints(timeout);
         }
 
-        let n = 3;
+        let n = 5;
         (function next() {
             this._setClass(elem, n % 2);
             if (n--)
diff --git a/common/content/javascript.js b/common/content/javascript.js
index c0d30380..a29ffadf 100644
--- a/common/content/javascript.js
+++ b/common/content/javascript.js
@@ -537,7 +537,7 @@ const JavaScript = Module("javascript", {
                 args.push(key + string);
 
                 let compl = function (context, obj) {
-                    let res = completer.call(self, context, funcName, obj, args);
+                    let res = completer.call(self, context, funcName, obj.obj, args);
                     if (res)
                         context.completions = res;
                 };