2 files changed, 3 insertions, 9 deletions
diff --git a/toolkit/components/console/content/console.xul b/toolkit/components/console/content/console.xul
index 0abd0a981..90b900cf9 100644
--- a/toolkit/components/console/content/console.xul
+++ b/toolkit/components/console/content/console.xul
@@ -77,9 +77,12 @@
       <toolbarseparator/>
       <toolbarbutton id="Console:clear" oncommand="clearConsole();"
                      label="&clear.label;" accesskey="&clear.accesskey;"/>
+      <toolbarspring/>
     </toolbar>
 
     <toolbar class="chromeclass-toolbar" id="ToolbarEval" align="center" nowindowdrag="true">
+      <label value="&filter2.label;" control="Filter"/>
+      <textbox accesskey="&filter2.accesskey;" type="search" id="Filter" oncommand="changeFilter();"/>
       <label value="&codeEval.label;" accesskey="&codeEval.accesskey;" control="TextboxEval"/>
       <textbox id="TextboxEval" class="toolbar" value="" onkeypress="onEvalKeyPress(event)" flex="1"/>
       <toolbarbutton id="ButtonEval" label="&evaluate.label;"
@@ -90,12 +93,4 @@
   <vbox id="ConsoleBox" class="console-box" flex="1" context="ConsoleContext" persist="sortOrder"/>
 
   <iframe name="Evaluator" id="Evaluator" collapsed="true"/>
-
-  <statusbar>
-    <statusbarpanel flex="1" pack="start">
-      <label value="&filter2.label;" control="Filter"/>
-      <textbox accesskey="&filter2.accesskey;" type="search"
-               id="Filter" oncommand="changeFilter();"/>
-    </statusbarpanel>
-  </statusbar>
 </window>
diff --git a/toolkit/components/telemetry/tests/unit/xpcshell.ini b/toolkit/components/telemetry/tests/unit/xpcshell.ini
index fe58d362e..42354c4cd 100644
--- a/toolkit/components/telemetry/tests/unit/xpcshell.ini
+++ b/toolkit/components/telemetry/tests/unit/xpcshell.ini
@@ -15,7 +15,6 @@ support-files =
   system.xpi
   restartless.xpi
   theme.xpi
-  !/toolkit/mozapps/webextensions/test/xpcshell/head_addons.js
 generated-files =
   dictionary.xpi
   experiment.xpi