1 files changed, 2 insertions, 0 deletions
diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java
index 438b086ec2..78cb5488e8 100644
--- a/server/src/com/vaadin/ui/UI.java
+++ b/server/src/com/vaadin/ui/UI.java
@@ -499,6 +499,7 @@ public abstract class UI extends AbstractSingleComponentContainer implements
     private void attachWindow(Window w) {
         windows.add(w);
         w.setParent(this);
+        fireComponentAttachEvent(w);
         markAsDirty();
     }
 
@@ -523,6 +524,7 @@ public abstract class UI extends AbstractSingleComponentContainer implements
         window.setParent(null);
         markAsDirty();
         window.fireClose();
+        fireComponentDetachEvent(window);
 
         return true;
     }