diff --git a/ChangeLog b/ChangeLog
index 212294cfb..185e38282 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 2012-07-09  Jean Raby  <jraby@inverse.ca>
 
-	* UI/WebServerResources/UIxContactsUserFolders.js (onSearchFormSubmit):
+	* UI/WebServerResources/generic.js (onSearchFormSubmit):
 	Restore behavior of a single dot (.) in the search field (wildcard search)
 
 	* UI/WebServerResources/SchedulerUI.js (onMenuRawEvent, onMenuRawTask):
diff --git a/UI/WebServerResources/UIxContactsUserFolders.js b/UI/WebServerResources/UIxContactsUserFolders.js
index 78517a638..06a4e99d2 100644
--- a/UI/WebServerResources/UIxContactsUserFolders.js
+++ b/UI/WebServerResources/UIxContactsUserFolders.js
@@ -14,8 +14,7 @@ function onSearchFormSubmit() {
             document.userFoldersRequest.aborted = true;
             document.userFoldersRequest.abort();
         }
-	if (encodedValue.trim().length > minimumSearchLength 
-            || encodedValue == "." ) {
+	if (encodedValue.trim().length > minimumSearchLength) {
 	    startAnimation($("pageContent"), $("filterPanel"));
             document.userFoldersRequest
                 = triggerAjaxRequest(url, usersSearchCallback);
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 7653e03fa..2d04513a0 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -1179,7 +1179,8 @@ function onSearchFormSubmit(event) {
 
     if (searchValue.value != searchValue.ghostPhrase
         && (searchValue.value != searchValue.lastSearch
-            && searchValue.value.strip().length > minimumSearchLength)) {
+            && (searchValue.value.strip().length > minimumSearchLength
+                || searchValue.value.strip() == "." ))) {
         search["criteria"] = searchCriteria.value;
         search["value"] = searchValue.value;
         searchValue.lastSearch = searchValue.value;