diff --git a/common/content/statusline.js b/common/content/statusline.js
index 1ee7bc4b..1db8c5c3 100644
--- a/common/content/statusline.js
+++ b/common/content/statusline.js
@@ -18,11 +18,13 @@ var StatusLine = Module("statusline", {
         if (this.statusBar.localName == "toolbar") {
             styles.system.add("addon-bar", config.styleableChrome, <css><![CDATA[
                 #status-bar { margin-top: 0 !important; }
-                #addon-bar { padding: 0 !important; min-height: 18px !important; -moz-appearance: none !important; }
                 #addon-bar > statusbar { -moz-box-flex: 1 }
                 #addon-bar > #addonbar-closebutton { visibility: collapse; }
                 #addon-bar > xul|toolbarspring { visibility: collapse; }
             ]]></css>);
+            highlight.loadCSS(<![CDATA[
+                !AddonBar;#addon-bar  padding: 0 !important; min-height: 18px !important; -moz-appearance: none !important;
+            ]]>);
         }
 
         let _commandline = "if (window.dactyl) return dactyl.modules.commandline";
diff --git a/common/modules/completion.jsm b/common/modules/completion.jsm
index 11b70ab3..aa32821f 100644
--- a/common/modules/completion.jsm
+++ b/common/modules/completion.jsm
@@ -864,7 +864,7 @@ var Completion = Module("completion", {
         listCompleter: function listCompleter(name, filter, maxItems) {
             let context = modules.CompletionContext(filter || "");
             context.maxItems = maxItems;
-            context.fork.apply(context, ["list", 0, completion, name].concat(Array.slice(arguments, 3)));
+            context.fork.apply(context, ["list", 0, this, name].concat(Array.slice(arguments, 3)));
             context = context.contexts["/list"];
             context.wait();