diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index edf3f909d..5ad540f18 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -862,7 +862,12 @@ function setSearchCriteria(event) {
   if (this.parentNode.chosenNode)
     this.parentNode.chosenNode.removeClassName("_chosen");
   this.addClassName("_chosen");
-  this.parentNode.chosenNode = this;
+
+  if (this.parentNode.chosenNode != this) {
+    searchValue.lastSearch = null;
+    this.parentNode.chosenNode = this;
+    onSearchFormSubmit();
+  }
 }
 
 function checkSearchValue(event) {