diff --git a/app/views/shared/_advanced_search.html.erb b/app/views/shared/_advanced_search.html.erb
index 7b9d3d6c4..e8f06f7bc 100644
--- a/app/views/shared/_advanced_search.html.erb
+++ b/app/views/shared/_advanced_search.html.erb
@@ -2,12 +2,14 @@
   <%= link_to t("shared.advanced_search.title"), "#", id: 'js-advanced-search-title', class: "advanced-search small" %>
 </div>
 
-<div class="advanced-search-form clear">
+<div class="row advanced-search-form">
   <%= form_tag search_path, method: :get do %>
     <div id='js-advanced-search' data-advanced-search-terms=<%= @advanced_search_terms.present? %> style="display: none">
 
       <div class="small-12 column">
-        <label><%= t("shared.advanced_search.general") %></label>
+        <label for="search">
+          <%= t("shared.advanced_search.general") %>
+        </label>
         <%= text_field_tag "search", params[:search],
                            placeholder: t("shared.advanced_search.general_placeholder") %>
       </div>
diff --git a/app/views/shared/_search_form.html.erb b/app/views/shared/_search_form.html.erb
index 5577f29d2..c14c41e7e 100644
--- a/app/views/shared/_search_form.html.erb
+++ b/app/views/shared/_search_form.html.erb
@@ -2,8 +2,8 @@
   <h1 class="sr-only"><%= t("shared.outline.searcher") %></h1>
   <%= form_tag search_path, method: :get do %>
     <div class="input-group">
-      <label class="sr-only"><%= t("#{i18n_namespace}.title") %></label>
-      <input type="text" name="search" placeholder="<%= t("#{i18n_namespace}.placeholder") %>" class="input-group-field" value="<%= params[:search] %>">
+      <label for="search_text" class="sr-only"><%= t("#{i18n_namespace}.title") %></label>
+      <input type="text" name="search" placeholder="<%= t("#{i18n_namespace}.placeholder") %>" class="input-group-field" value="<%= params[:search] %>" id="search_text">
       <div class="input-group-button">
         <button type="submit" class="button" title="<%= t("#{i18n_namespace}.button") %>">
           <span class="sr-only"><%= t("#{i18n_namespace}.button") %></span>