diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 2c2e2b96..713c05cf 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -38,7 +38,7 @@
       <%= render partial: "shared/navbar" %>
     </div>
 
-    <div class="legacy-ui <%= controller.controller_name %>">
+    <div class="bootstrap legacy-ui <%= controller.controller_name %>">
       <%= render_flash %>
 
       <div id="content" class="<%= controller.controller_name %>">
diff --git a/app/views/search/_index.html.erb b/app/views/search/_index.html.erb
new file mode 100644
index 00000000..40b4b8bf
--- /dev/null
+++ b/app/views/search/_index.html.erb
@@ -0,0 +1,12 @@
+<div class="container-fluid">
+<%= form_tag(search_results_path, class: 'navbar-form') do %>
+  <div class="input-group">
+    <%= text_field_tag(:search, params[:search], class: 'form-control', autofocus: true) %>
+    <div class="input-group-btn">
+      <%= button_tag(type: 'submit', class: 'btn pull-right') do%>
+        <%= icon('search', class: 'hidden-xs') %>
+      <% end %>
+    </div>
+  </div>
+<% end %>
+</div>
diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb
index 186a534f..a5661f8e 100644
--- a/app/views/shared/_navbar.html.erb
+++ b/app/views/shared/_navbar.html.erb
@@ -55,14 +55,11 @@
             <li><%= link_to t('layouts.navigation.api_docs'), rest_api_docs_path %></li>
           </ul>
         </li>
-        <li>
-          <%= link_to search_path, title: t('layouts.navigation.search') do %>
-            <%= icon('search', class: 'hidden-xs') %>
-            <%= content_tag :span, t('layouts.navigation.search'), class: 'visible-xs-inline' %>
-          <% end %>
-        </li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
+        <li>
+          <%= render partial: "search/index" %>
+        </li>
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
             <%= icon('cog', class: 'hidden-xs') %>