diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index e08440f38..777453570 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -434,16 +434,20 @@ function onDocumentKeydown(event) {
 
 /* Search mail, call the template and open inside a dialog windoƒw */
 function onSearchMail(event) {
-    if ($("searchMailView")) {
-        $("searchMailView").style.display = "block";
-        $("bgDialogDiv").style.display = "block";
-        initSearchMailView();
-    }
-    else {
-        var urlstr = ApplicationBaseURL + "/search";
-        
-        // Return the template for the searchMail feature
-        triggerAjaxRequest(urlstr, displaySearchMailCallback);
+    if (event.element().disabled == false || event.element().disabled == undefined) {
+        event.element().disabled = true;
+        event.element().writeAttribute("id", "toolbarSearchButton");
+        if ($("searchMailView")) {
+            $("searchMailView").style.display = "block";
+            $("bgDialogDiv").style.display = "block";
+            initSearchMailView();
+        }
+        else {
+            var urlstr = ApplicationBaseURL + "/search";
+            
+            // Return the template for the searchMail feature
+            triggerAjaxRequest(urlstr, displaySearchMailCallback);
+        }
     }
 }
 
diff --git a/UI/WebServerResources/UIxMailSearch.js b/UI/WebServerResources/UIxMailSearch.js
index df649c2f9..4ec62b8df 100644
--- a/UI/WebServerResources/UIxMailSearch.js
+++ b/UI/WebServerResources/UIxMailSearch.js
@@ -226,6 +226,8 @@ function onSearchEnd() {
 function onCancelClick() {
     disposeDialog();
     $("searchMailView").remove();
+    $("toolbarSearchButton").disabled = false;
+    
 }
 
 function onSearchSubfoldersCheck(event) {