diff --git a/render.c b/render.c
index 58a93a33..4e5ec60f 100644
--- a/render.c
+++ b/render.c
@@ -2555,8 +2555,8 @@ render_urls(struct terminal *term)
         const wchar_t *key = url->key;
         const size_t entered_key_len = wcslen(term->url_keys);
 
-        struct wl_surface *surf = it->item.surf;
-        struct wl_subsurface *sub_surf = it->item.sub_surf;
+        struct wl_surface *surf = it->item.surf.surf;
+        struct wl_subsurface *sub_surf = it->item.surf.sub;
 
         if (surf == NULL || sub_surf == NULL)
             continue;
diff --git a/terminal.c b/terminal.c
index 6c54543e..6c0827c6 100644
--- a/terminal.c
+++ b/terminal.c
@@ -2845,7 +2845,7 @@ term_surface_kind(const struct terminal *term, const struct wl_surface *surface)
         return TERM_SURF_BUTTON_CLOSE;
     else {
         tll_foreach(term->window->urls, it) {
-            if (surface == it->item.surf)
+            if (surface == it->item.surf.surf)
                 return TERM_SURF_JUMP_LABEL;
         }
         return TERM_SURF_NONE;
diff --git a/url-mode.c b/url-mode.c
index df0f8fb8..ac379c8e 100644
--- a/url-mode.c
+++ b/url-mode.c
@@ -472,45 +472,14 @@ void
 urls_render(struct terminal *term)
 {
     struct wl_window *win = term->window;
-    struct wayland *wayl = term->wl;
 
     if (tll_length(win->term->urls) == 0)
         return;
 
     xassert(tll_length(win->urls) == 0);
     tll_foreach(win->term->urls, it) {
-        struct wl_surface *surf = wl_compositor_create_surface(wayl->compositor);
-        wl_surface_set_user_data(surf, win);
-
-        struct wl_subsurface *sub_surf = NULL;
-
-        if (surf != NULL) {
-            sub_surf = wl_subcompositor_get_subsurface(
-                wayl->sub_compositor, surf, win->surface);
-
-            if (sub_surf != NULL)
-                wl_subsurface_set_sync(sub_surf);
-        }
-
-        if (surf == NULL || sub_surf == NULL) {
-            LOG_WARN("failed to create URL (sub)-surface");
-
-            if (surf != NULL) {
-                wl_surface_destroy(surf);
-                surf = NULL;
-            }
-
-            if (sub_surf != NULL) {
-                wl_subsurface_destroy(sub_surf);
-                sub_surf = NULL;
-            }
-        }
-
-        struct wl_url url = {
-            .url = &it->item,
-            .surf = surf,
-            .sub_surf = sub_surf,
-        };
+        struct wl_url url = {.url = &it->item};
+        wayl_win_subsurface_new(win, &url.surf);
 
         tll_push_back(win->urls, url);
         tag_cells_for_url(term, &it->item, true);
@@ -536,10 +505,7 @@ urls_reset(struct terminal *term)
 
     if (term->window != NULL) {
         tll_foreach(term->window->urls, it) {
-            if (it->item.sub_surf != NULL)
-                wl_subsurface_destroy(it->item.sub_surf);
-            if (it->item.surf != NULL)
-                wl_surface_destroy(it->item.surf);
+            wayl_win_subsurface_destroy(&it->item.surf);
             tll_remove(term->window->urls, it);
         }
     }
diff --git a/wayland.c b/wayland.c
index 1dfd04ba..14cd0c85 100644
--- a/wayland.c
+++ b/wayland.c
@@ -1430,10 +1430,7 @@ wayl_win_destroy(struct wl_window *win)
     tll_free(win->on_outputs);
 
     tll_foreach(win->urls, it) {
-        if (it->item.sub_surf != NULL)
-            wl_subsurface_destroy(it->item.sub_surf);
-        if (it->item.surf != NULL)
-            wl_surface_destroy(it->item.surf);
+        wayl_win_subsurface_destroy(&it->item.surf);
         tll_remove(win->urls, it);
     }
 
diff --git a/wayland.h b/wayland.h
index 2e4c7037..5f4d8b76 100644
--- a/wayland.h
+++ b/wayland.h
@@ -357,8 +357,7 @@ struct wl_surf_subsurf {
 
 struct wl_url {
     const struct url *url;
-    struct wl_surface *surf;
-    struct wl_subsurface *sub_surf;
+    struct wl_surf_subsurf surf;
 };
 
 struct wayland;