diff --git a/shell_client.cpp b/shell_client.cpp
index 5a8e5467b4..9c9b1ec774 100644
--- a/shell_client.cpp
+++ b/shell_client.cpp
@@ -195,6 +195,7 @@ void ShellClient::init()
         }
     );
     connect(s, &SurfaceInterface::unmapped, this, &ShellClient::unmap);
+    connect(s, &SurfaceInterface::unbound, this, &ShellClient::destroyClient);
     connect(s, &SurfaceInterface::destroyed, this, &ShellClient::destroyClient);
     if (m_shellSurface) {
         initSurface(m_shellSurface);