diff --git a/app/assets/stylesheets/advanced_search.scss b/app/assets/stylesheets/advanced_search.scss
new file mode 100644
index 000000000..367b3c579
--- /dev/null
+++ b/app/assets/stylesheets/advanced_search.scss
@@ -0,0 +1,30 @@
+.advanced-search {
+  float: left;
+  margin: $line-height 0;
+  position: inherit;
+
+  @include breakpoint(medium) {
+    float: right;
+    margin-bottom: 0;
+    margin-top: $line-height / 4;
+    position: absolute;
+    right: 0;
+  }
+}
+
+.advanced-search-form {
+
+  @include breakpoint(medium) {
+    > .column {
+      padding: 0;
+    }
+  }
+
+  select {
+    height: $line-height * 2;
+  }
+
+  .column.end.clear {
+    clear: both;
+  }
+}
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 38c4185fc..b03ac1368 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -6,6 +6,7 @@
 @import "icons";
 @import "mixins";
 @import "admin";
+@import "advanced_search";
 @import "layout";
 @import "participation";
 @import "milestones";
diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 4f229794e..6e46858cd 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -8,7 +8,6 @@
 // 06. Forms
 // 07. Callout
 // 08. User account
-// 09. Search
 // 10. Official levels
 // 11. Tables
 // 12. Social
@@ -1480,40 +1479,6 @@ form {
   }
 }
 
-// 09. Search
-// ----------
-
-.advanced-search {
-  float: left;
-  margin: $line-height 0;
-  position: inherit;
-
-  @include breakpoint(medium) {
-    float: right;
-    margin-bottom: 0;
-    margin-top: $line-height / 4;
-    position: absolute;
-    right: 0;
-  }
-}
-
-.advanced-search-form {
-
-  @include breakpoint(medium) {
-    > .column {
-      padding: 0;
-    }
-  }
-
-  select {
-    height: $line-height * 2;
-  }
-
-  .column.end.clear {
-    clear: both;
-  }
-}
-
 // 10. Officials levels
 // --------------------
 
diff --git a/app/views/shared/_advanced_search.html.erb b/app/components/shared/advanced_search_component.html.erb
similarity index 97%
rename from app/views/shared/_advanced_search.html.erb
rename to app/components/shared/advanced_search_component.html.erb
index 95a45c5a5..e5333a321 100644
--- a/app/views/shared/_advanced_search.html.erb
+++ b/app/components/shared/advanced_search_component.html.erb
@@ -4,7 +4,7 @@
 
 <div class="row advanced-search-form">
   <%= form_tag request.path, id: "advanced_search_form", method: :get do %>
-    <div id="js-advanced-search" data-advanced-search-terms="<%= @advanced_search_terms.present? %>" style="display: none">
+    <div id="js-advanced-search" data-advanced-search-terms="<%= advanced_search.present? %>" style="display: none">
 
       <div class="small-12 column">
         <label for="search">
diff --git a/app/components/shared/advanced_search_component.rb b/app/components/shared/advanced_search_component.rb
new file mode 100644
index 000000000..1e0f1189b
--- /dev/null
+++ b/app/components/shared/advanced_search_component.rb
@@ -0,0 +1,31 @@
+class Shared::AdvancedSearchComponent < ApplicationComponent
+
+  private
+
+    def advanced_search
+      params[:advanced_search]
+    end
+
+    def official_level_search_options
+      options_for_select((1..5).map { |i| [setting["official_level_#{i}_name"], i] },
+                         params[:advanced_search].try(:[], :official_level))
+    end
+
+    def date_range_options
+      options_for_select([
+        [t("shared.advanced_search.date_1"), 1],
+        [t("shared.advanced_search.date_2"), 2],
+        [t("shared.advanced_search.date_3"), 3],
+        [t("shared.advanced_search.date_4"), 4],
+        [t("shared.advanced_search.date_5"), "custom"]],
+        selected_date_range)
+    end
+
+    def selected_date_range
+      custom_date_range? ? "custom" : params[:advanced_search].try(:[], :date_min)
+    end
+
+    def custom_date_range?
+      params[:advanced_search].try(:[], :date_max).present?
+    end
+end
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
deleted file mode 100644
index fad5be141..000000000
--- a/app/helpers/search_helper.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-module SearchHelper
-  def official_level_search_options
-    options_for_select((1..5).map { |i| [setting["official_level_#{i}_name"], i] },
-                       params[:advanced_search].try(:[], :official_level))
-  end
-
-  def date_range_options
-    options_for_select([
-      [t("shared.advanced_search.date_1"), 1],
-      [t("shared.advanced_search.date_2"), 2],
-      [t("shared.advanced_search.date_3"), 3],
-      [t("shared.advanced_search.date_4"), 4],
-      [t("shared.advanced_search.date_5"), "custom"]],
-      selected_date_range)
-  end
-
-  def selected_date_range
-    custom_date_range? ? "custom" : params[:advanced_search].try(:[], :date_min)
-  end
-
-  def custom_date_range?
-    params[:advanced_search].try(:[], :date_max).present?
-  end
-end
diff --git a/app/views/budgets/investments/index.html.erb b/app/views/budgets/investments/index.html.erb
index 1d1da6493..c1cca7353 100644
--- a/app/views/budgets/investments/index.html.erb
+++ b/app/views/budgets/investments/index.html.erb
@@ -55,7 +55,7 @@
         </div>
       <% end %>
 
-      <%= render("shared/advanced_search") %>
+      <%= render Shared::AdvancedSearchComponent.new %>
 
       <% if unfeasible_or_unselected_filter %>
         <ul class="no-bullet submenu">
diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index 941484b7b..0d9651360 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -52,7 +52,7 @@
         </div>
       </div>
 
-      <%= render "shared/advanced_search" %>
+      <%= render Shared::AdvancedSearchComponent.new %>
 
       <%= render "shared/order_links", i18n_namespace: "debates.index" %>
 
diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb
index 73470cc84..c28790495 100644
--- a/app/views/proposals/index.html.erb
+++ b/app/views/proposals/index.html.erb
@@ -73,7 +73,7 @@
       <% end %>
 
       <% unless params[:retired].present? || params[:selected].present? %>
-        <%= render "shared/advanced_search" %>
+        <%= render Shared::AdvancedSearchComponent.new %>
       <% end %>
 
       <% unless params[:selected].present? %>