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 269ffa29914c0e32a7eb40b1655a3e444701601a..70a35b1237a26c2eb2a3ee564166ce38fa8266e8 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
@@ -871,11 +871,22 @@ public abstract class AbstractBrowserGrid<T/* Entity */, M extends BaseEntityMod
             {
                 public void execute()
                 {
+                    // N. B. -- The order in which things are refreshed and configured is
+                    // significant
+
                     pagingToolbar.disableExportButton();
                     pagingToolbar.updateDefaultConfigButton(false);
-                    filterToolbar.refreshAndReset();
+
+                    // Need to reset filter fields *before* refreshing the gridso the list can be correctly
+                    // retrieved
+                    filterToolbar.resetFilterFields();
+
                     // export and config buttons are enabled when ListEntitiesCallback is complete
                     refresh();
+
+                    // Need to refresh the filter toolbar *after* refreshing the grid, because it has
+                    // a dependency on information from the grid that gets updated with the refesh
+                    filterToolbar.refresh();
                 }
             };
     }
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterToolbar.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterToolbar.java
index 53208c2f7fa6f7fcb7df3e2bf0cd121e3dc877a0..1f399b24d5b4abd3e8860079420dd5d13a00437f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterToolbar.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterToolbar.java
@@ -258,7 +258,7 @@ public class FilterToolbar<T> extends ToolBar implements IDatabaseModificationOb
     }
 
     @SuppressWarnings("unchecked")
-    private void resetFilterFields()
+    public void resetFilterFields()
     {
         for (Component field : filterContainer.getItems())
         {