diff --git a/client/galaxy/scripts/entry/panels/tool-panel.js b/client/galaxy/scripts/entry/panels/tool-panel.js
index 47b1ab4cfbe..e59bb4f492e 100644
--- a/client/galaxy/scripts/entry/panels/tool-panel.js
+++ b/client/galaxy/scripts/entry/panels/tool-panel.js
@@ -52,9 +52,17 @@ const ToolPanel = Backbone.View.extend({
                 title: _l("Show favorites"),
                 icon: "fa fa-star-o",
                 onclick: e => {
-                    $("#tool-search-query")
-                        .val("#favorites")
-                        .trigger("change");
+                    const $search_query = $("#tool-search-query");
+                    const $header_btn = $(".panel-header-button");
+                    $header_btn.find(".fa").toggleClass("fa-star-o fa-star");
+                    $header_btn.tooltip("hide");
+                    if ($search_query.val().indexOf("#favorites") != -1) {
+                        $search_query.val("");
+                        $search_query.keyup();
+                        $header_btn.attr("title", "");
+                    } else {
+                        $search_query.val("#favorites").trigger("change");
+                    }
                 }
             });
             panel_buttons.push(this.favorite_button);