diff --git a/app/assets/javascripts/discourse/app/components/search-menu.hbs b/app/assets/javascripts/discourse/app/components/search-menu.hbs
index 1e88826fc58..7bdf891ffbb 100644
--- a/app/assets/javascripts/discourse/app/components/search-menu.hbs
+++ b/app/assets/javascripts/discourse/app/components/search-menu.hbs
@@ -46,7 +46,9 @@
         {{#if this.search.activeGlobalSearchTerm}}
           <SearchMenu::ClearButton @clearSearch={{this.clearSearch}} />
         {{/if}}
-        <SearchMenu::AdvancedButton @href={{this.advancedSearchButtonHref}} />
+        <SearchMenu::AdvancedButton
+          @openAdvancedSearch={{this.openAdvancedSearch}}
+        />
       </div>
     {{/if}}
   </div>
diff --git a/app/assets/javascripts/discourse/app/components/search-menu.js b/app/assets/javascripts/discourse/app/components/search-menu.js
index 9511164e9c3..aa4ed7386fc 100644
--- a/app/assets/javascripts/discourse/app/components/search-menu.js
+++ b/app/assets/javascripts/discourse/app/components/search-menu.js
@@ -146,8 +146,10 @@ export default class SearchMenu extends Component {
     return getURL(url);
   }
 
-  get advancedSearchButtonHref() {
-    return this.fullSearchUrl({ expanded: true });
+  @action
+  openAdvancedSearch() {
+    this.fullSearch();
+    this.close();
   }
 
   get displayMenuPanelResults() {
diff --git a/app/assets/javascripts/discourse/app/components/search-menu/advanced-button.hbs b/app/assets/javascripts/discourse/app/components/search-menu/advanced-button.hbs
index b1b847c430c..7b46dfbaf9a 100644
--- a/app/assets/javascripts/discourse/app/components/search-menu/advanced-button.hbs
+++ b/app/assets/javascripts/discourse/app/components/search-menu/advanced-button.hbs
@@ -1,7 +1,6 @@
-<a
+<DButton
   class="show-advanced-search"
   title={{i18n "search.open_advanced"}}
-  href={{@href}}
->
-  {{d-icon "sliders-h"}}
-</a>
\ No newline at end of file
+  @action={{@openAdvancedSearch}}
+  @icon="sliders-h"
+/>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/tests/acceptance/search-test.js b/app/assets/javascripts/discourse/tests/acceptance/search-test.js
index 7589b9d874f..6ed421bb43e 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/search-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/search-test.js
@@ -90,6 +90,10 @@ acceptance("Search - Anonymous", function (needs) {
       "it goes to full search page and preserves the search term"
     );
 
+    assert
+      .dom(".search-menu .search-menu-panel")
+      .doesNotExist("closes search menu after clicking advanced search button");
+
     assert.ok(
       exists(".search-advanced-options"),
       "advanced search is expanded"
diff --git a/app/assets/stylesheets/common/base/search-menu.scss b/app/assets/stylesheets/common/base/search-menu.scss
index 4138a53e77c..0000b0bb166 100644
--- a/app/assets/stylesheets/common/base/search-menu.scss
+++ b/app/assets/stylesheets/common/base/search-menu.scss
@@ -350,7 +350,7 @@ $search-pad-horizontal: 0.5em;
       margin-top: 2px;
     }
 
-    a.show-advanced-search,
+    .show-advanced-search,
     a.clear-search {
       padding: 0px 3px;
       display: inline-block;