diff --git a/src/protocols/XDGShell.cpp b/src/protocols/XDGShell.cpp
index 718733745..5e82b5305 100644
--- a/src/protocols/XDGShell.cpp
+++ b/src/protocols/XDGShell.cpp
@@ -666,8 +666,9 @@ CXDGWMBase::CXDGWMBase(SP<CXdgWmBase> resource_) : resource(resource_) {
             return;
         }
 
-        RESOURCE->self = RESOURCE;
-        SURF->role     = RESOURCE;
+        RESOURCE->self    = RESOURCE;
+        RESOURCE->surface = SURF;
+        SURF->role        = RESOURCE;
 
         surfaces.emplace_back(RESOURCE);