diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnSettingsChooser.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnSettingsChooser.java
index 691f5ffa54761b3948845d8fab4d2ddda07143bc..92b6deda0a4b665b7363ff0eb58df974910edcaa 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnSettingsChooser.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnSettingsChooser.java
@@ -176,9 +176,8 @@ class ColumnSettingsChooser
             add(new SeparatorToolItem());
             add(new WidgetComponent(createLink(Selectable.VISIBLE, false)));
             add(new SeparatorToolItem());
-            // WORKAROUND to fix problems with layout when many filters are shown
-            // add(new WidgetComponent(createLink(Selectable.FILTER, true)));
-            // add(new SeparatorToolItem());
+            add(new WidgetComponent(createLink(Selectable.FILTER, true)));
+            add(new SeparatorToolItem());
             add(new WidgetComponent(createLink(Selectable.FILTER, false)));
             add(new FillToolItem());
             Button up = new Button("Move Up");
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 87b09560d4caf5c1c273a5210398e3cbe1ad52ea..ead46c5fe5e978d102b6210994df24b93205bd86 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
@@ -245,6 +245,7 @@ public class FilterToolbar<T> extends ToolBar implements IDatabaseModificationOb
     // copes well with cases when one filter widget changes into another.
     private void updateFilterContainer(List<Widget> filterWidgets)
     {
+        filterContainer.hide();
         boolean changed = false;
         filterContainer.disableEvents(true);
         for (int i = 0; i < filterWidgets.size(); i++)
@@ -271,6 +272,10 @@ public class FilterToolbar<T> extends ToolBar implements IDatabaseModificationOb
             changed = true;
         }
         filterContainer.enableEvents(true);
+        if (filterContainer.getItemCount() > 0)
+        {
+            filterContainer.show();
+        }
         if (changed)
         {
             // contentPanel of AbstractBrowserGrid is listening on this layout and synchronizes size