diff --git a/xdgshellclient.cpp b/xdgshellclient.cpp
index 0c7d586248..0c2e30ff74 100644
--- a/xdgshellclient.cpp
+++ b/xdgshellclient.cpp
@@ -70,9 +70,7 @@ XdgShellClient::XdgShellClient(XdgShellSurfaceInterface *surface)
     , m_xdgShellPopup(nullptr)
 {
     setSurface(surface->surface());
-    m_requestGeometryBlockCounter++;
     init();
-    connect(surface->surface(), &SurfaceInterface::committed, this, &XdgShellClient::finishInit);
 }
 
 XdgShellClient::XdgShellClient(XdgShellPopupInterface *surface)
@@ -81,15 +79,15 @@ XdgShellClient::XdgShellClient(XdgShellPopupInterface *surface)
     , m_xdgShellPopup(surface)
 {
     setSurface(surface->surface());
-    m_requestGeometryBlockCounter++;
     init();
-    connect(surface->surface(), &SurfaceInterface::committed, this, &XdgShellClient::finishInit);
 }
 
 XdgShellClient::~XdgShellClient() = default;
 
 void XdgShellClient::init()
 {
+    m_requestGeometryBlockCounter++;
+
     connect(this, &XdgShellClient::desktopFileNameChanged, this, &XdgShellClient::updateIcon);
     createWindowId();
     setupCompositing();
@@ -173,6 +171,8 @@ void XdgShellClient::init()
     handleTransientForChanged();
 
     AbstractClient::updateColorScheme(QString());
+
+    connect(surface(), &SurfaceInterface::committed, this, &XdgShellClient::finishInit);
 }
 
 void XdgShellClient::finishInit()