diff --git a/server/public/assets/js/channel.js b/server/public/assets/js/channel.js
index 3b1b5604..b2d17303 100644
--- a/server/public/assets/js/channel.js
+++ b/server/public/assets/js/channel.js
@@ -146,6 +146,11 @@ var Channel = {
         M.Modal.init(document.getElementById("advanced_filter"), {
             onCloseEnd: function() {
                 document.querySelector(".filter-results").innerHTML = "";
+                document.getElementById("filtersearch_input").value = "";
+                document.getElementById("filtersearch_input").blur();
+            },
+            onOpenEnd: function() {
+                document.getElementById("filtersearch_input").focus();
             }
         });
         M.Modal.init(document.getElementById("help"));
diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js
index 4cc84619..011213d6 100755
--- a/server/public/assets/js/listeners.js
+++ b/server/public/assets/js/listeners.js
@@ -691,7 +691,6 @@ function addDynamicListeners() {
 
     addListener("click", "#open_advanced_filter", function(e) {
         this.preventDefault();
-        document.getElementById("filtersearch_input").focus();
         M.Modal.getInstance(document.getElementById("advanced_filter")).open();
     });