diff --git a/share/public/javascripts/netdisco.js b/share/public/javascripts/netdisco.js
index bef4551e..1a5030c6 100644
--- a/share/public/javascripts/netdisco.js
+++ b/share/public/javascripts/netdisco.js
@@ -167,7 +167,7 @@ $(document).ready(function() {
   $('.nd_field-clear-icon').hide();
 
   // activate typeahead on the main search box, for device names only
-  $('#nq').typeahead({
+  $('#nq,#nqbody').typeahead({
     source: function (query, process) {
       return $.get( uri_base + '/ajax/data/devicename/typeahead', { query: query }, function (data) {
         return process(data);
@@ -186,6 +186,13 @@ $(document).ready(function() {
   });
   $('.nd_navsearchgo-specific').click(function(event) {
     event.preventDefault();
+    if ($('#nqbody').val()) {
+      $(this).parents('form').append(
+        $(document.createElement('input')).attr('type', 'hidden')
+                                          .attr('name', 'tab')
+                                          .attr('value', $(this).data('tab'))
+      ).submit();
+    }
     if ($('#nq').val()) {
       $(this).parents('form').append(
         $(document.createElement('input')).attr('type', 'hidden')
diff --git a/share/views/index.tt b/share/views/index.tt
index ca888597..0744ed2b 100644
--- a/share/views/index.tt
+++ b/share/views/index.tt
@@ -50,6 +50,25 @@
           [% END %]
         </form>
         [% ELSE %]
+          <p></p> <p></p>
+          <form class="" method="get" action="[% uri_for('/search') %]">
+            <div class="form-horizontal">
+              <input placeholder="Find Anything" class="span4" id="nqbody" name="q" type="text" autocomplete="off"/>
+              <input name="firstsearch" type="hidden" value="on">
+              <div class="btn-group">
+                <button type="submit" class="btn btn-primary">Search</button>
+                <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                  <span class="caret"></span>&nbsp;
+                </button>
+                <ul class="dropdown-menu">
+                  <li><a class="nd_navsearchgo-specific" href="" data-tab="device">Search Devices</a></li>
+                  <li><a class="nd_navsearchgo-specific" href="" data-tab="node">Search Nodes</a></li>
+                  <li><a class="nd_navsearchgo-specific" href="" data-tab="vlan">Search VLANs</a></li>
+                  <li><a class="nd_navsearchgo-specific" href="" data-tab="port">Search Ports</a></li>
+                </ul>
+              </div>
+            </div>
+          </form>
           [% IF user_has_role('admin') %]
           <form class="nd_login-form" method="post" action="[% uri_for('/admin/discover') %]">
             <div class="form-horizontal">
@@ -87,7 +106,7 @@
 [% IF session.logged_in_user %]
 <script type="text/javascript">
   var stats_loaded = 0;
-  $('#nq').focus(); // set focus to navbar search
+  $('#nqbody').focus(); // set focus to main search
   $('#loginuser').focus(); // set focus to login, if it's there
 
   $('.collapse').on('show', function() {
diff --git a/share/views/layouts/main.tt b/share/views/layouts/main.tt
index 91b74128..f1b12a34 100644
--- a/share/views/layouts/main.tt
+++ b/share/views/layouts/main.tt
@@ -153,8 +153,7 @@
         <div class="btn-group nd_navbar-search-group">
           <button class="btn btn-inverse nd_navbar-search-icon">
             <span style="font-size: 18px;">
-              <i id="navsearchgo" class="icon-search"
-                rel="tooltip" data-placement="bottom" data-offset="5" data-title="New Search" data-container="body"></i>
+              <i id="navsearchgo" class="icon-search"></i>
             </span>
           </button>
           <button class="btn btn-inverse dropdown-toggle nd_navbar-search-caret" data-toggle="dropdown">