diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SearchWidget.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SearchWidget.java
index 506d617d6e42b52a7c14f583cf22cc34e87b54da..d2c7ca620707503d9ed05f0f6efd6548e33c073b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SearchWidget.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SearchWidget.java
@@ -164,7 +164,16 @@ final class SearchWidget extends LayoutContainer
         final String queryText = textField.getValue();
         if (StringUtils.isBlank(queryText) == false)
         {
-            if ("*".equals(queryText) || "?".equals(queryText))
+            boolean onlyWildcard = true;
+            for (final char c : queryText.toCharArray())
+            {
+                if (c != '*' && c != '?')
+                {
+                    onlyWildcard = false;
+                    break;
+                }
+            }
+            if (onlyWildcard)
             {
                 final IMessageProvider messageProvider = viewContext.getMessageProvider();
                 MessageBox.alert(messageProvider.getMessage("messagebox_warning"), messageProvider