diff --git a/shell_client.cpp b/shell_client.cpp
index f3faa135e7..d5d7a1f410 100644
--- a/shell_client.cpp
+++ b/shell_client.cpp
@@ -151,11 +151,11 @@ void ShellClient::setOpacity(double opacity)
 
 void ShellClient::addDamage(const QRegion &damage)
 {
-    setReadyForPainting();
     if (m_shellSurface->surface()->buffer()->size().isValid()) {
         m_clientSize = m_shellSurface->surface()->buffer()->size();
         setGeometry(QRect(geom.topLeft(), m_clientSize));
     }
+    setReadyForPainting();
     Toplevel::addDamage(damage);
 }
 
diff --git a/wayland_server.cpp b/wayland_server.cpp
index 9248805f5b..05a470f5ae 100644
--- a/wayland_server.cpp
+++ b/wayland_server.cpp
@@ -127,7 +127,7 @@ void WaylandServer::init(const QByteArray &socketName)
                 connect(client, &ShellClient::windowShown, this,
                     [this, client] {
                         emit shellClientAdded(client);
-                    }, Qt::QueuedConnection
+                    }
                 );
             }
         }