diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ListColumnFilterWidget.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ListColumnFilterWidget.java
index 83ac545107b026a2825b9ce1b62e19cadc85c25a..462139ef2620d7d4ae6ac597d60fc00986a475f2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ListColumnFilterWidget.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ListColumnFilterWidget.java
@@ -86,6 +86,7 @@ public class ListColumnFilterWidget<T> extends ComboBox<ModelData> implements
         setValidateOnBlur(false);
         String label = filteredField.getHeader();
         setEmptyText(label);
+        setToolTip(label);
         setTemplate(GWTUtils.getTooltipTemplate(MODEL_DISPLAY_KEY, ModelDataPropertyNames.TOOLTIP));
     }
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/TextColumnFilterWidget.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/TextColumnFilterWidget.java
index ef4497f91b45c0a95826b0a768fbe33e0ce4aa5e..1ecb8205339e63d97a40bc450d573fc9b89d0fba 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/TextColumnFilterWidget.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/TextColumnFilterWidget.java
@@ -49,6 +49,7 @@ public class TextColumnFilterWidget<T/* entity */> extends StoreFilterField<Mode
         setWidth(100);
         String label = filteredField.getHeader();
         setEmptyText(label);
+        setToolTip(label);
     }
 
     public String getFilteredColumnId()