diff --git a/src/xdgshellwindow.cpp b/src/xdgshellwindow.cpp
index ef92707ffc..e56d9a4885 100644
--- a/src/xdgshellwindow.cpp
+++ b/src/xdgshellwindow.cpp
@@ -295,6 +295,8 @@ void XdgSurfaceWindow::destroyWindow()
 {
     handleRoleDestroyed();
     markAsDeleted();
+    Q_EMIT closed();
+
     stopDelayedInteractiveMoveResize();
     if (isInteractiveMoveResize()) {
         leaveInteractiveMoveResize();
@@ -305,7 +307,6 @@ void XdgSurfaceWindow::destroyWindow()
     qDeleteAll(m_configureEvents);
     m_configureEvents.clear();
     cleanTabBox();
-    Q_EMIT closed();
     StackingUpdatesBlocker blocker(workspace());
     workspace()->rulebook()->discardUsed(this, true);
     cleanGrouping();