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 93cedfb8f632d02a55655ccc803a6fdad953ee0e..53208c2f7fa6f7fcb7df3e2bf0cd121e3dc877a0 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
@@ -184,6 +184,10 @@ public class FilterToolbar<T> extends ToolBar implements IDatabaseModificationOb
 
     private void updateFilterFields()
     {
+        // Only show the filter selection widget if there are user choices
+        boolean isFilterSelectionWidgetVisible = filterSelectionWidget.getStore().getCount() > 1;
+        filterSelectionWidget.setVisible(isFilterSelectionWidgetVisible);
+
         filterContainer.removeAll();
         if (isColumnFilterSelected())
         {