diff --git a/app/assets/javascripts/advanced_search.js b/app/assets/javascripts/advanced_search.js
index 9fcf8ae5f..7ca0245a1 100644
--- a/app/assets/javascripts/advanced_search.js
+++ b/app/assets/javascripts/advanced_search.js
@@ -4,10 +4,6 @@
     advanced_search_terms: function() {
       return $("#js-advanced-search").data("advanced-search-terms");
     },
-    toggle_form: function(event) {
-      event.preventDefault();
-      $("#js-advanced-search").slideToggle();
-    },
     toggle_date_options: function() {
       if ($("#js-advanced-search-date-min").val() === "custom") {
         $("#js-custom-date").show();
@@ -23,8 +19,9 @@
         App.AdvancedSearch.toggle_date_options();
       }
       $("#js-advanced-search-title").on({
-        click: function(event) {
-          App.AdvancedSearch.toggle_form(event);
+        click: function() {
+          $(this).attr("aria-expanded", !JSON.parse($(this).attr("aria-expanded")));
+          $("#js-advanced-search").slideToggle();
         }
       });
       $("#js-advanced-search-date-min").on({
diff --git a/app/assets/stylesheets/advanced_search.scss b/app/assets/stylesheets/advanced_search.scss
index 9191bb83c..2ec042cd0 100644
--- a/app/assets/stylesheets/advanced_search.scss
+++ b/app/assets/stylesheets/advanced_search.scss
@@ -1,4 +1,6 @@
 .advanced-search {
+  color: $link;
+  cursor: pointer;
   float: left;
   margin: $line-height 0;
   position: inherit;
@@ -10,6 +12,10 @@
     position: absolute;
     right: 0;
   }
+
+  &:focus {
+    outline: $outline-focus;
+  }
 }
 
 .advanced-search-form {
diff --git a/app/components/shared/advanced_search_component.html.erb b/app/components/shared/advanced_search_component.html.erb
index 903542908..6ac0c3f8b 100644
--- a/app/components/shared/advanced_search_component.html.erb
+++ b/app/components/shared/advanced_search_component.html.erb
@@ -1,5 +1,7 @@
 <div class="relative">
-  <%= link_to t("shared.advanced_search.title"), "#advanced_search_form", id: "js-advanced-search-title", class: "advanced-search small" %>
+  <button type="button" aria-expanded="<%= advanced_search.present? %>" id="js-advanced-search-title" class="advanced-search small">
+    <%= t("shared.advanced_search.title") %>
+  </button>
 </div>
 
 <div class="row advanced-search-form">
diff --git a/spec/system/advanced_search_spec.rb b/spec/system/advanced_search_spec.rb
index 8eefdbec3..f6f296663 100644
--- a/spec/system/advanced_search_spec.rb
+++ b/spec/system/advanced_search_spec.rb
@@ -11,7 +11,7 @@ describe "Advanced search" do
 
     visit debates_path
 
-    click_link "Advanced search"
+    click_button "Advanced search"
     fill_in "Write the text", with: "Schwifty"
     click_button "Filter"
 
@@ -31,7 +31,7 @@ describe "Advanced search" do
 
     visit proposals_path
 
-    click_link "Advanced search"
+    click_button "Advanced search"
     fill_in "Write the text", with: "Schwifty"
     click_button "Filter"
 
@@ -51,7 +51,7 @@ describe "Advanced search" do
 
     visit budget_investments_path(budget)
 
-    click_link "Advanced search"
+    click_button "Advanced search"
     fill_in "Write the text", with: "Schwifty"
     click_button "Filter"
 
@@ -76,7 +76,7 @@ describe "Advanced search" do
 
       visit debates_path
 
-      click_link "Advanced search"
+      click_button "Advanced search"
       select "Official position 1", from: "advanced_search_official_level"
       click_button "Filter"
 
@@ -100,7 +100,7 @@ describe "Advanced search" do
 
       visit proposals_path
 
-      click_link "Advanced search"
+      click_button "Advanced search"
       select "Official position 2", from: "advanced_search_official_level"
       click_button "Filter"
 
@@ -124,7 +124,7 @@ describe "Advanced search" do
 
       visit budget_investments_path(budget)
 
-      click_link "Advanced search"
+      click_button "Advanced search"
       select "Official position 3", from: "advanced_search_official_level"
       click_button "Filter"
 
@@ -148,7 +148,7 @@ describe "Advanced search" do
 
       visit debates_path
 
-      click_link "Advanced search"
+      click_button "Advanced search"
       select "Official position 4", from: "advanced_search_official_level"
       click_button "Filter"
 
@@ -172,7 +172,7 @@ describe "Advanced search" do
 
       visit proposals_path
 
-      click_link "Advanced search"
+      click_button "Advanced search"
       select "Official position 5", from: "advanced_search_official_level"
       click_button "Filter"
 
@@ -194,7 +194,7 @@ describe "Advanced search" do
 
           visit budget_investments_path(budget)
 
-          click_link "Advanced search"
+          click_button "Advanced search"
           select "Last 24 hours", from: "js-advanced-search-date-min"
           click_button "Filter"
 
@@ -214,7 +214,7 @@ describe "Advanced search" do
 
           visit debates_path
 
-          click_link "Advanced search"
+          click_button "Advanced search"
           select "Last week", from: "js-advanced-search-date-min"
           click_button "Filter"
 
@@ -234,7 +234,7 @@ describe "Advanced search" do
 
           visit proposals_path
 
-          click_link "Advanced search"
+          click_button "Advanced search"
           select "Last month", from: "js-advanced-search-date-min"
           click_button "Filter"
 
@@ -254,7 +254,7 @@ describe "Advanced search" do
 
           visit budget_investments_path(budget)
 
-          click_link "Advanced search"
+          click_button "Advanced search"
           select "Last year", from: "js-advanced-search-date-min"
           click_button "Filter"
 
@@ -275,7 +275,7 @@ describe "Advanced search" do
 
         visit debates_path
 
-        click_link "Advanced search"
+        click_button "Advanced search"
         select "Customized", from: "js-advanced-search-date-min"
         fill_in "advanced_search_date_min", with: 7.days.ago.strftime("%d/%m/%Y")
         fill_in "advanced_search_date_max", with: 1.day.ago.strftime("%d/%m/%Y")
@@ -298,7 +298,7 @@ describe "Advanced search" do
 
         visit proposals_path
 
-        click_link "Advanced search"
+        click_button "Advanced search"
         select "Customized", from: "js-advanced-search-date-min"
         fill_in "advanced_search_date_min", with: 4000.years.ago.strftime("%d/%m/%Y")
         fill_in "advanced_search_date_max", with: "13/13/2199"
@@ -325,7 +325,7 @@ describe "Advanced search" do
 
         visit budget_investments_path(budget)
 
-        click_link "Advanced search"
+        click_button "Advanced search"
         fill_in "Write the text", with: "Schwifty"
         select "Official position 1", from: "advanced_search_official_level"
         select "Last 24 hours", from: "js-advanced-search-date-min"
@@ -343,7 +343,7 @@ describe "Advanced search" do
         Setting["official_level_1_name"] = "Official position 1"
 
         visit debates_path
-        click_link "Advanced search"
+        click_button "Advanced search"
 
         fill_in "Write the text", with: "Schwifty"
         select "Official position 1", from: "advanced_search_official_level"
@@ -360,7 +360,7 @@ describe "Advanced search" do
 
       scenario "Maintain custom date search criteria" do
         visit proposals_path
-        click_link "Advanced search"
+        click_button "Advanced search"
 
         select "Customized", from: "js-advanced-search-date-min"
         fill_in "advanced_search_date_min", with: 7.days.ago.strftime("%d/%m/%Y")
@@ -391,7 +391,7 @@ describe "Advanced search" do
         create(:budget_investment, title: "Hospital", heading: heading, sdg_goals: [SDG::Goal[3]])
 
         visit budget_investments_path(budget)
-        click_link "Advanced search"
+        click_button "Advanced search"
         select "6. Clean Water and Sanitation", from: "By SDG"
         click_button "Filter"
 
@@ -413,7 +413,7 @@ describe "Advanced search" do
         create(:debate, title: "Preschool", sdg_targets: [SDG::Target["4.2"]])
 
         visit debates_path
-        click_link "Advanced search"
+        click_button "Advanced search"
         select "4.2", from: "By target"
         click_button "Filter"
 
@@ -429,7 +429,7 @@ describe "Advanced search" do
       scenario "Dynamic target options depending on the selected goal" do
         visit proposals_path
 
-        click_link "Advanced search"
+        click_button "Advanced search"
         select "1. No Poverty", from: "By SDG"
 
         expect(page).to have_select "By target",