diff --git a/templates/zephyr/index.html b/templates/zephyr/index.html
index bab4d51fb2..62139d6f95 100644
--- a/templates/zephyr/index.html
+++ b/templates/zephyr/index.html
@@ -65,12 +65,10 @@ var people_list = {{ people }};
               </tbody>
             </table>
             <br/><br/>
-            <div class="searchbox row">
+            <div class="narrowbox row">
               <div class="input-prepend input-append pull-left">
                 <button id="show_all_messages" class="btn" disabled=disabled onclick="show_all_messages()"><i class="icon-remove"></i></button>
                 <span class="add-on"><span id="currently_narrowed_to" class="badge"></span></span>
-                <input class="input-xlarge search-query" type="text" value="" placeholder="Search">
-                <button class="btn"><i class="icon-search"></i></button>
               </div>
             </div>
             <div id="bottom_whitespace"></div>
diff --git a/zephyr/static/js/zephyr.js b/zephyr/static/js/zephyr.js
index 201e48d892..4048b80185 100644
--- a/zephyr/static/js/zephyr.js
+++ b/zephyr/static/js/zephyr.js
@@ -372,7 +372,7 @@ function do_narrow(description, filter_function) {
     scroll_to_selected();
 
     $("#show_all_messages").removeAttr("disabled");
-    $("div.searchbox").show();
+    $("div.narrowbox").show();
     $("#currently_narrowed_to").html(description);
 }
 
@@ -444,7 +444,7 @@ function show_all_messages() {
 
     scroll_to_selected();
 
-    $("div.searchbox").hide();
+    $("div.narrowbox").hide();
     $("#show_all_messages").attr("disabled", "disabled");
     $("#currently_narrowed_to").html("");
 }
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index e9f7af3dcc..fa51e9a745 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -201,7 +201,7 @@ input.send_zephyr {
     float: right;
 }
 
-div.searchbox {
+div.narrowbox {
     position: fixed;
     display: none;
     padding: 2px;
@@ -222,7 +222,3 @@ td.selected_message_indicator {
     background-color: blue;
     width: 2px;
 }
-
-form#zephyr_searchbox {
-    margin: 0px;
-}