diff --git a/shell_client.cpp b/shell_client.cpp
index a5f4a05fda..9f68bd0d93 100644
--- a/shell_client.cpp
+++ b/shell_client.cpp
@@ -188,9 +188,9 @@ void ShellClient::addDamage(const QRegion &damage)
         }
         setGeometry(QRect(position, m_clientSize));
     }
+    m_unmapped = false;
     setDepth(m_shellSurface->surface()->buffer()->hasAlphaChannel() ? 32 : 24);
     setReadyForPainting();
-    m_unmapped = false;
     Toplevel::addDamage(damage);
 }