diff --git a/src/helpers/SubsurfaceTree.cpp b/src/helpers/SubsurfaceTree.cpp
index b4ea6d854..9f53e8adc 100644
--- a/src/helpers/SubsurfaceTree.cpp
+++ b/src/helpers/SubsurfaceTree.cpp
@@ -145,6 +145,7 @@ void Events::listener_newSubsurfaceNode(void* owner, void* data) {
     const auto        PSUBSURFACE = (wlr_subsurface*)data;
 
     const auto        PNEWSUBSURFACE = &pNode->childSubsurfaces.emplace_back();
+    PNEWSUBSURFACE->surface.assign(PSUBSURFACE->surface);
 
     Debug::log(LOG, "Added a new subsurface {:x}", (uintptr_t)PSUBSURFACE);
 
diff --git a/src/helpers/SubsurfaceTree.hpp b/src/helpers/SubsurfaceTree.hpp
index 7a8b8fb81..811c8f662 100644
--- a/src/helpers/SubsurfaceTree.hpp
+++ b/src/helpers/SubsurfaceTree.hpp
@@ -36,6 +36,7 @@ struct SSurfaceTreeNode {
 
 struct SSubsurface {
     wlr_subsurface*   pSubsurface = nullptr;
+    CWLSurface        surface;
 
     SSurfaceTreeNode* pParent = nullptr;
     SSurfaceTreeNode* pChild  = nullptr;