1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
index fa1d61c224..ba9534efda 100755
--- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
@@ -560,8 +560,7 @@ public class ApplicationConnection {
             final Widget w = (Widget) it.next();
             if (w instanceof Paintable) {
                 unregisterPaintable((Paintable) w);
-            }
-            if (w instanceof HasWidgets) {
+            } else if (w instanceof HasWidgets) {
                 unregisterChildPaintables((HasWidgets) w);
             }
         }