1 files changed, 14 insertions, 0 deletions
diff --git a/server/src/main/java/com/vaadin/ui/PopupView.java b/server/src/main/java/com/vaadin/ui/PopupView.java
index 6b497386f3..dabcab7803 100644
--- a/server/src/main/java/com/vaadin/ui/PopupView.java
+++ b/server/src/main/java/com/vaadin/ui/PopupView.java
@@ -413,4 +413,18 @@ public class PopupView extends AbstractComponent implements HasComponents {
          */
         public void popupVisibilityChange(PopupVisibilityEvent event);
     }
+
+    @Override
+    public void detach() {
+        setPopupVisible(false);
+        super.detach();
+    }
+
+    @Override
+    public void setVisible(boolean visible) {
+        if (!visible) {
+            setPopupVisible(false);
+        }
+        super.setVisible(visible);
+    }
 }