diff --git a/modules/desktop/src/com/haulmont/cuba/desktop/gui/components/DesktopFilter.java b/modules/desktop/src/com/haulmont/cuba/desktop/gui/components/DesktopFilter.java
index 385e73a7b2..03757896af 100644
--- a/modules/desktop/src/com/haulmont/cuba/desktop/gui/components/DesktopFilter.java
+++ b/modules/desktop/src/com/haulmont/cuba/desktop/gui/components/DesktopFilter.java
@@ -72,6 +72,7 @@ public class DesktopFilter extends DesktopAbstractComponent<JPanel> implements F
         setWidth("100%");
 
         delegate.addExpandedStateChangeListener(e -> fireExpandStateChange(e.isExpanded()));
+        delegate.setCaptionChangedListener(this::updateCaption);
     }
 
     @Override
@@ -210,6 +211,12 @@ public class DesktopFilter extends DesktopAbstractComponent<JPanel> implements F
     @Override
     public void setCaption(String caption) {
         delegate.setCaption(caption);
+
+        updateCaption(caption);
+    }
+
+    protected void updateCaption(String caption) {
+        ((HasCaption) delegate.getLayout()).setCaption(caption);
     }
 
     @Override