1 files changed, 24 insertions, 0 deletions
diff --git a/src/com/vaadin/ui/Window.java b/src/com/vaadin/ui/Window.java
index e6c8642b84..a6cf51e80f 100644
--- a/src/com/vaadin/ui/Window.java
+++ b/src/com/vaadin/ui/Window.java
@@ -898,4 +898,28 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier {
         bringToFront();
     }
 
+    /**
+     * Notifies the child components and subwindows that the window is attached
+     * to the application.
+     */
+    @Override
+    public void attach() {
+        super.attach();
+        for (Window w : subwindows) {
+            w.attach();
+        }
+    }
+
+    /**
+     * Notifies the child components and subwindows that the window is detached
+     * from the application.
+     */
+    @Override
+    public void detach() {
+        super.detach();
+        for (Window w : subwindows) {
+            w.detach();
+        }
+    }
+
 }