diff --git a/src/search/templates/search/search.html b/src/search/templates/search/search.html
index c5c5194..92e1b61 100644
--- a/src/search/templates/search/search.html
+++ b/src/search/templates/search/search.html
@@ -40,6 +40,20 @@
   <hr/>
 
   <div class="row">
+
+    <form class="col-xs-12 col-sm-12 col-md-12 hidden-lg" action="{% url "haystack_search" %}">
+      <div class="input-group">
+        <input type="text" class="form-control" name="q" placeholder="{% trans "Search here" %}"
+         {% if request.GET.q %}value="{{ request.GET.q }}"{% endif %} />
+        <div class="input-group-btn">
+          <button type="submit" class="btn btn-primary">
+            <span class="glyphicon glyphicon-search"></span>
+          </button>
+        </div>
+      </div>
+    </form>
+    <br />
+
     <div id="filters" class="hidden-xs hidden-sm col-md-2 col-lg-2">
       <h3>{% trans "Filters" %}</h3>
       {% include "search/includes/search_filters.html" %}
diff --git a/src/static/css/screen.css b/src/static/css/screen.css
index 88b1f95..6e842ba 100644
--- a/src/static/css/screen.css
+++ b/src/static/css/screen.css
@@ -399,11 +399,3 @@ ul.emails {
 span.highlighted {
     background-color: yellow;
 }
-
-/* Mobile search form */
-.navbar-nav > li > .mobile-search-form {
-  padding-top: 10px;
-  padding-bottom: 10px;
-  line-height: 20px;
-  padding: 5px 15px 5px 15px;
-}
diff --git a/src/templates/base.html b/src/templates/base.html
index fadc00c..51de333 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -63,27 +63,6 @@
             <span class="icon-bar"></span>
           </button>
           <a class="navbar-brand" href="/"><img alt="Colab" src="/static/img/logo_nav.png"></a>
-
-          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".mobile-search">
-            <span class="glyphicon glyphicon-search"></span>
-          </button>
-
-        </div>
-
-        <!-- Mobile Search -->
-        <div class="collapse mobile-search">
-          <ul class="nav navbar-nav hidden-md hidden-lg">
-            <li>
-              <form action="{% url 'haystack_search' %}" class="search mobile-search-form" role="search">
-                <div class="form-group">
-                  <input name="q" class="form-control"
-                         value="{{ request.GET.q }}"
-                         type="search" placeholder="{% trans 'Search here...' %}" />
-                </div>
-                <button class="btn btn-default">{% trans "Search" %} <span class="glyphicon glyphicon-search"></span></button>
-              </form>
-            </li>
-          </ul>
         </div>
 
         <div class="collapse navbar-collapse navbar-main">
@@ -107,6 +86,9 @@
                 <li><a href="/report">{% trans "View Tickets" %}</a></li>
               </ul>
             </li>
+            <li>
+              <a href="{% url 'haystack_search' %}?q=">{% trans "Search" %}</a>
+            </li>
           </ul>
 
           <ul class="nav navbar-nav navbar-right">
--
libgit2 0.21.2