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 a6c9102fe5c6b153a98ac7d85ae7b7e0b7912466..d4ca0d39cc08bb2e786705f2b660fbddce6182cf 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
@@ -268,19 +268,23 @@ final class SearchWidget extends LayoutContainer
             if (entities.size() == 0)
             {
                 final IMessageProvider messageProvider = viewContext.getMessageProvider();
+                final Listener<WindowEvent> listener = null;
+                // TODO 2008-11-21, Christian Ribeaud: Replace the <null> listener with the
+                // following once gxt solved the problem with event propagation in MessageBox.
+                // final Listener<WindowEvent> listener = new Listener<WindowEvent>()
+                // {
+                //
+                // //
+                // // Listener
+                // //
+                //
+                // public final void handleEvent(final WindowEvent be)
+                // {
+                // selectAllAndFocus();
+                // }
+                // };
                 MessageBox.alert(messageProvider.getMessage("messagebox_warning"), messageProvider
-                        .getMessage("no_match", queryText), new Listener<WindowEvent>()
-                    {
-
-                        //
-                        // Listener
-                        //
-
-                        public final void handleEvent(final WindowEvent be)
-                        {
-                            selectAllAndFocus();
-                        }
-                    });
+                        .getMessage("no_match", queryText), listener);
                 return;
             }
             textField.reset();
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/EnterKeyListener.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/EnterKeyListener.java
index fab20d9ad1e955700eab2f610487ea1693c6bd7e..7cbe7a8821a264a6ca71416934c9bd2c731f2c3a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/EnterKeyListener.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/EnterKeyListener.java
@@ -23,6 +23,7 @@ public abstract class EnterKeyListener extends KeyListener
         {
             onEnterKey();
             event.stopEvent();
+            event.doit = false;
         }
     }
 }
\ No newline at end of file