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 b1e8fc34f02e79429e8719f3ef5c1a7040d6410f..a88677550e0ce4b77745ad0eeac2ea16c2ee5cde 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
@@ -137,7 +137,6 @@ public final class SearchWidget extends LayoutContainer
 
         // reset the text field
         textField.setValue("");
-        searchButton.setEnabled(false);
         SearchableEntity selectedEntity = entityChooser.getSelectedSearchableEntity();
         
         if (viewContext.isSimpleOrEmbeddedMode())
@@ -148,6 +147,7 @@ public final class SearchWidget extends LayoutContainer
             History.newItem(url);
         } else
         {
+            searchButton.setEnabled(false);
             ActionFinish searchFinish = new ActionFinish() {
                 public void finish() {
                     searchButton.setEnabled(true);