diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractBrowserGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractBrowserGrid.java
index 7b592ee10bc561798a424a17811c7f213b755d29..b5976247d15f253e439a96a0f1f54837b85b5f4a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractBrowserGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractBrowserGrid.java
@@ -421,6 +421,7 @@ public abstract class AbstractBrowserGrid<T/* Entity */, M extends ModelData> ex
         @Override
         protected final void finishOnFailure(final Throwable caught)
         {
+            grid.el().unmask();
             onComplete(false);
             delegate.onFailure(caught);
         }
@@ -551,7 +552,7 @@ public abstract class AbstractBrowserGrid<T/* Entity */, M extends ModelData> ex
                     {
                         public void handleEvent(SelectionEvent<ModelData> se)
                         {
-                            boolean enabled = (se.selection.size() > 0);
+                            boolean enabled = se.selection.size() > 0;
                             button.setEnabled(enabled);
                         }
 
@@ -821,6 +822,7 @@ public abstract class AbstractBrowserGrid<T/* Entity */, M extends ModelData> ex
                     exportDataKey);
             WindowUtils.openWindow(methodWithParameters.toString());
         }
+
     }
 
     // creates a map to quickly find a definition by its identifier