fixes #5778

svn changeset:15519/svn branch:6.5

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java
index 4813dbcd2154a2b2302d3c7e15662d9cfff2049e..e0a74735b7a5c19e4db3a8a00a75b1220b19a81a 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java
@@ -170,6 +170,11 @@ public class VCssLayout extends SimplePanel implements Paintable, Container {
                 final Paintable child = client.getPaintable(r);
                 if (oldWidgets.contains(child)) {
                     oldWidgets.remove(child);
+                    VCaption vCaption = widgetToCaption.get(child);
+                    if (vCaption != null) {
+                        add(vCaption);
+                        oldWidgets.remove(vCaption);
+                    }
                 }
 
                 add((Widget) child);