diff --git a/src/xdg.c b/src/xdg.c
index 71a4df44..59a6f553 100644
--- a/src/xdg.c
+++ b/src/xdg.c
@@ -309,12 +309,12 @@ xdg_toplevel_view_map(struct view *view)
 		position_xdg_toplevel_view(view);
 
 		struct wlr_subsurface *subsurface;
-		wl_list_for_each(subsurface, &view->surface->subsurfaces_below,
-				 parent_link) {
+		wl_list_for_each(subsurface, &view->surface->current.subsurfaces_below,
+				 current.link) {
 			subsurface_create(view, subsurface);
 		}
-		wl_list_for_each(subsurface, &view->surface->subsurfaces_above,
-				 parent_link) {
+		wl_list_for_each(subsurface, &view->surface->current.subsurfaces_above,
+				 current.link) {
 			subsurface_create(view, subsurface);
 		}