diff --git a/sway/tree/view.c b/sway/tree/view.c
index 200b7c2ad..1ee00f8d8 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -1038,10 +1038,12 @@ static void view_child_handle_surface_destroy(struct wl_listener *listener,
 static void view_init_subsurfaces(struct sway_view *view,
 		struct wlr_surface *surface) {
 	struct wlr_subsurface *subsurface;
-	wl_list_for_each(subsurface, &surface->subsurfaces_below, parent_link) {
+	wl_list_for_each(subsurface, &surface->current.subsurfaces_below,
+			current.link) {
 		view_subsurface_create(view, subsurface);
 	}
-	wl_list_for_each(subsurface, &surface->subsurfaces_above, parent_link) {
+	wl_list_for_each(subsurface, &surface->current.subsurfaces_above,
+			current.link) {
 		view_subsurface_create(view, subsurface);
 	}
 }
@@ -1049,10 +1051,12 @@ static void view_init_subsurfaces(struct sway_view *view,
 static void view_child_init_subsurfaces(struct sway_view_child *view_child,
 		struct wlr_surface *surface) {
 	struct wlr_subsurface *subsurface;
-	wl_list_for_each(subsurface, &surface->subsurfaces_below, parent_link) {
+	wl_list_for_each(subsurface, &surface->current.subsurfaces_below,
+			current.link) {
 		view_child_subsurface_create(view_child, subsurface);
 	}
-	wl_list_for_each(subsurface, &surface->subsurfaces_above, parent_link) {
+	wl_list_for_each(subsurface, &surface->current.subsurfaces_above,
+			current.link) {
 		view_child_subsurface_create(view_child, subsurface);
 	}
 }