diff --git a/common/content/statusline.js b/common/content/statusline.js
index 85e6afec..03d6d7ca 100644
--- a/common/content/statusline.js
+++ b/common/content/statusline.js
@@ -24,6 +24,7 @@ var StatusLine = Module("statusline", {
             ]]></css>);
             highlight.loadCSS(<![CDATA[
                 !AddonBar;#addon-bar  padding: 0 !important; min-height: 18px !important; -moz-appearance: none !important;
+                !AddonButton;#addon-bar>xul|toolbarbutton  -moz-appearance: none !important; padding: 0 !important;
             ]]>);
         }
 
diff --git a/common/modules/javascript.jsm b/common/modules/javascript.jsm
index e3bd2f8d..d48b4659 100644
--- a/common/modules/javascript.jsm
+++ b/common/modules/javascript.jsm
@@ -55,6 +55,8 @@ var JavaScript = Module("javascript", {
 
         let seen = isinstance(obj, ["Sandbox"]) ? set(JavaScript.magicalNames) : {};
         let globals = values(toplevel && this.window === obj ? this.globalNames : []);
+        if (toplevel && "wrappedJSObject" in obj)
+            yield "wrappedJSObject";
         for (let key in iter(globals, properties(obj, !toplevel, true)))
             if (!set.add(seen, key))
                 yield key;