diff --git a/include/desktop/view.h b/include/desktop/view.h
index 2fdb074..548a651 100644
--- a/include/desktop/view.h
+++ b/include/desktop/view.h
@@ -71,7 +71,7 @@ struct kiwmi_view {
 
 struct kiwmi_view_impl {
     void (*close)(struct kiwmi_view *view);
-    void (*for_each_mapped_surface)(
+    void (*for_each_surface)(
         struct kiwmi_view *view,
         wlr_surface_iterator_func_t callback,
         void *user_data);
@@ -131,7 +131,7 @@ struct kiwmi_request_resize_event {
 };
 
 void view_close(struct kiwmi_view *view);
-void view_for_each_mapped_surface(
+void view_for_each_surface(
     struct kiwmi_view *view,
     wlr_surface_iterator_func_t callback,
     void *user_data);
diff --git a/kiwmi/desktop/output.c b/kiwmi/desktop/output.c
index 8aeddfd..432cd67 100644
--- a/kiwmi/desktop/output.c
+++ b/kiwmi/desktop/output.c
@@ -179,8 +179,7 @@ output_frame_notify(struct wl_listener *listener, void *data)
 
         struct kiwmi_view *view;
         wl_list_for_each (view, &desktop->views, link) {
-            view_for_each_mapped_surface(
-                view, send_frame_done_to_surface, &now);
+            view_for_each_surface(view, send_frame_done_to_surface, &now);
         }
 
         if (render_cursors(wlr_output)) {
@@ -227,7 +226,7 @@ output_frame_notify(struct wl_listener *listener, void *data)
         rdata.data = view;
 
         wl_signal_emit(&view->events.pre_render, &rdata);
-        view_for_each_mapped_surface(view, render_surface, &rdata);
+        view_for_each_surface(view, render_surface, &rdata);
         wl_signal_emit(&view->events.post_render, &rdata);
     }
 
diff --git a/kiwmi/desktop/view.c b/kiwmi/desktop/view.c
index 67d3c64..bf2e418 100644
--- a/kiwmi/desktop/view.c
+++ b/kiwmi/desktop/view.c
@@ -24,13 +24,13 @@ view_close(struct kiwmi_view *view)
 }
 
 void
-view_for_each_mapped_surface(
+view_for_each_surface(
     struct kiwmi_view *view,
     wlr_surface_iterator_func_t callback,
     void *user_data)
 {
-    if (view->impl->for_each_mapped_surface) {
-        view->impl->for_each_mapped_surface(view, callback, user_data);
+    if (view->impl->for_each_surface) {
+        view->impl->for_each_surface(view, callback, user_data);
     }
 }
 
diff --git a/kiwmi/desktop/xdg_shell.c b/kiwmi/desktop/xdg_shell.c
index 6439ed0..de52af9 100644
--- a/kiwmi/desktop/xdg_shell.c
+++ b/kiwmi/desktop/xdg_shell.c
@@ -294,89 +294,12 @@ xdg_shell_view_close(struct kiwmi_view *view)
 }
 
 static void
-surface_for_each_mapped_surface(
-    struct wlr_surface *surface,
-    int x,
-    int y,
-    wlr_surface_iterator_func_t callback,
-    void *user_data)
-{
-    struct wlr_subsurface *subsurface;
-    wl_list_for_each (
-        subsurface, &surface->current.subsurfaces_below, current.link) {
-        if (!subsurface->mapped) {
-            continue;
-        }
-
-        surface_for_each_mapped_surface(
-            subsurface->surface,
-            x + subsurface->current.x,
-            y + subsurface->current.y,
-            callback,
-            user_data);
-    }
-
-    callback(surface, x, y, user_data);
-
-    wl_list_for_each (
-        subsurface, &surface->current.subsurfaces_above, current.link) {
-        if (!subsurface->mapped) {
-            continue;
-        }
-
-        surface_for_each_mapped_surface(
-            subsurface->surface,
-            x + subsurface->current.x,
-            y + subsurface->current.y,
-            callback,
-            user_data);
-    }
-}
-
-static void
-xdg_surface_for_each_mapped_popup_surface(
-    struct wlr_xdg_surface *surface,
-    int x,
-    int y,
-    wlr_surface_iterator_func_t callback,
-    void *user_data)
-{
-    struct wlr_xdg_popup *popup;
-    wl_list_for_each (popup, &surface->popups, link) {
-        struct wlr_xdg_surface *popup_surface = popup->base;
-        if (!popup_surface->configured || !popup_surface->mapped) {
-            continue;
-        }
-
-        double popup_sx, popup_sy;
-        wlr_xdg_popup_get_position(popup, &popup_sx, &popup_sy);
-
-        surface_for_each_mapped_surface(
-            popup_surface->surface,
-            x + popup_sx,
-            y + popup_sy,
-            callback,
-            user_data);
-        xdg_surface_for_each_mapped_popup_surface(
-            popup_surface, x + popup_sx, y + popup_sy, callback, user_data);
-    }
-}
-
-static void
-xdg_shell_view_for_each_mapped_surface(
+xdg_shell_view_for_each_surface(
     struct kiwmi_view *view,
     wlr_surface_iterator_func_t callback,
     void *user_data)
 {
-    if (!view->mapped) {
-        return;
-    }
-
-    // Have to copy over the wlroots implementation with only small changes
-    surface_for_each_mapped_surface(
-        view->xdg_surface->surface, 0, 0, callback, user_data);
-    xdg_surface_for_each_mapped_popup_surface(
-        view->xdg_surface, 0, 0, callback, user_data);
+    wlr_xdg_surface_for_each_surface(view->xdg_surface, callback, user_data);
 }
 
 static pid_t
@@ -438,14 +361,14 @@ xdg_shell_view_surface_at(
 }
 
 static const struct kiwmi_view_impl xdg_shell_view_impl = {
-    .close                   = xdg_shell_view_close,
-    .for_each_mapped_surface = xdg_shell_view_for_each_mapped_surface,
-    .get_pid                 = xdg_shell_view_get_pid,
-    .get_string_prop         = xdg_shell_view_get_string_prop,
-    .set_activated           = xdg_shell_view_set_activated,
-    .set_size                = xdg_shell_view_set_size,
-    .set_tiled               = xdg_shell_view_set_tiled,
-    .surface_at              = xdg_shell_view_surface_at,
+    .close            = xdg_shell_view_close,
+    .for_each_surface = xdg_shell_view_for_each_surface,
+    .get_pid          = xdg_shell_view_get_pid,
+    .get_string_prop  = xdg_shell_view_get_string_prop,
+    .set_activated    = xdg_shell_view_set_activated,
+    .set_size         = xdg_shell_view_set_size,
+    .set_tiled        = xdg_shell_view_set_tiled,
+    .surface_at       = xdg_shell_view_surface_at,
 };
 
 void