diff --git a/shell_client.cpp b/shell_client.cpp
index c4cf5ddb46..bc164e2a62 100644
--- a/shell_client.cpp
+++ b/shell_client.cpp
@@ -97,6 +97,7 @@ void ShellClient::init()
         }
     );
     connect(s, &SurfaceInterface::unmapped, this, &ShellClient::unmap);
+    connect(s, &SurfaceInterface::destroyed, this, &ShellClient::destroyClient);
     if (m_shellSurface) {
         connect(m_shellSurface, &ShellSurfaceInterface::destroyed, this, &ShellClient::destroyClient);
         connect(m_shellSurface, &ShellSurfaceInterface::titleChanged, this, &ShellClient::captionChanged);