diff --git a/src/desktop/Window.cpp b/src/desktop/Window.cpp
index 8d6a4fa4..4318dbbc 100644
--- a/src/desktop/Window.cpp
+++ b/src/desktop/Window.cpp
@@ -486,12 +486,13 @@ void CWindow::onUnmap() {
     g_pCompositor->updateWorkspaceSpecialRenderData(workspaceID());
     g_pCompositor->updateAllWindowsAnimatedDecorationValues();
 
+    m_pWorkspace.reset();
+
     if (m_bIsX11)
         return;
 
     m_pSubsurfaceHead.reset();
     m_pPopupHead.reset();
-    m_pWorkspace.reset();
 }
 
 void CWindow::onMap() {