diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index f6e187152f5..2a17bb89852 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-9137
\ No newline at end of file
+9138
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/.gitrev b/mozilla/webtools/bugzilla/.gitrev
index d424142288b..8c2e0f69c5e 100644
--- a/mozilla/webtools/bugzilla/.gitrev
+++ b/mozilla/webtools/bugzilla/.gitrev
@@ -1 +1 @@
-164d2a87891967a7b5e3935d537319745c00599e
\ No newline at end of file
+2288b4680c04ec00bff02179de926fdfbd896c79
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl
index c85564d2739..41fe93b9309 100644
--- a/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/list/list.html.tmpl
@@ -188,8 +188,8 @@
 [%# Navigation Bar                                                           #%]
 [%############################################################################%]
 
-  [% IF bugs.size > 0 %]
-    <div class="buglist_menu">
+  <div class="buglist_menu">
+    [% IF bugs.size > 0 %]
       <div class="bz_query_buttons">
         <form method="post" action="show_bug.cgi">
           [% buglist_joined = buglist.join(",") %]
@@ -253,33 +253,33 @@
         [% Hook.process("links") %]
       </div>
       <br>
-      <div class="bz_query_edit">
+    [% END %]
+    <div class="bz_query_edit">
         <a href="[% PROCESS edit_search_url %]"><button>Edit Search</button></a>
-      </div>
-
-      [% IF searchtype == "saved" %]
-        <div class="bz_query_forget">
-           <a href="buglist.cgi?cmdtype=dorem&amp;remaction=forget&amp;namedcmd=
-                [% searchname FILTER uri %]&amp;token=
-                [% issue_hash_token([search_id, searchname]) FILTER uri %]"
-           ><button>Forget Search '[% searchname FILTER html %]'</button></a>
-        </div>
-      [% ELSE %]
-        <div class="bz_query_remember">
-          <form method="get" action="buglist.cgi">
-            <input type="submit" id="remember" value="Remember search"> as
-            <input type="hidden" name="newquery"
-                   value="[% urlquerypart FILTER html %][% "&order=$qorder" FILTER html IF order %]">
-            <input type="hidden" name="cmdtype" value="doit">
-            <input type="hidden" name="remtype" value="asnamed">
-            <input type="hidden" name="token" value="[% issue_hash_token(['savedsearch']) FILTER html %]">
-            <input type="text" id="save_newqueryname" name="newqueryname" size="20"
-                   title="New query name" value="[% defaultsavename FILTER html %]">
-          </form>
-        </div>
-      [% END %]
     </div>
-  [% END %]
+
+    [% IF searchtype == "saved" %]
+      <div class="bz_query_forget">
+         <a href="buglist.cgi?cmdtype=dorem&amp;remaction=forget&amp;namedcmd=
+              [% searchname FILTER uri %]&amp;token=
+              [% issue_hash_token([search_id, searchname]) FILTER uri %]"
+         ><button>Forget Search '[% searchname FILTER html %]'</button></a>
+      </div>
+    [% ELSE %]
+      <div class="bz_query_remember">
+        <form method="get" action="buglist.cgi">
+          <input type="submit" id="remember" value="Remember search"> as
+          <input type="hidden" name="newquery"
+                 value="[% urlquerypart FILTER html %][% "&order=$qorder" FILTER html IF order %]">
+          <input type="hidden" name="cmdtype" value="doit">
+          <input type="hidden" name="remtype" value="asnamed">
+          <input type="hidden" name="token" value="[% issue_hash_token(['savedsearch']) FILTER html %]">
+          <input type="text" id="save_newqueryname" name="newqueryname" size="20"
+                 title="New query name" value="[% defaultsavename FILTER html %]">
+        </form>
+      </div>
+    [% END %]
+  </div>
 
 [% IF one_product.defined && bugs.size %]
   <p class="bz_query_single_product">