diff --git a/src/xdgshellwindow.cpp b/src/xdgshellwindow.cpp
index 22f6aa872b..1b2ec98ca6 100644
--- a/src/xdgshellwindow.cpp
+++ b/src/xdgshellwindow.cpp
@@ -1723,6 +1723,7 @@ bool XdgPopupWindow::hasPopupGrab() const
 void XdgPopupWindow::popupDone()
 {
     m_shellSurface->sendPopupDone();
+    destroyWindow();
 }
 
 bool XdgPopupWindow::isPopupWindow() const