diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 8d23e2430..9c1d1c577 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -623,7 +623,7 @@ function onMailboxTreeItemClick(event) {
     topNode.selectedEntry = this;
 
     search = {};
-    $("searchValue").value = "";
+    $$('[name="search"]').first().value = "";
     initCriteria();
 
     Mailer.currentMailboxType = this.parentNode.getAttribute("datatype");
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 118465e31..93394c4bf 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -1183,7 +1183,8 @@ function onSearchFormSubmit(filterPanel) {
     if (searchValue.value != searchValue.ghostPhrase
         && (searchValue.value != searchValue.lastSearch
             && (searchValue.value.strip().length > minimumSearchLength
-                || searchValue.value.strip() == "." ))) {
+                || searchValue.value.strip() == "."
+                || searchValue.value.length == 0))) {
         search[id]["criteria"] = searchCriteria.value;
         search[id]["value"] = searchValue.value;
         searchValue.lastSearch = searchValue.value;