diff --git a/xdg.c b/xdg.c
index f0cf177..5fd4e40 100644
--- a/xdg.c
+++ b/xdg.c
@@ -91,6 +91,7 @@ static void xdg_toplevel_map(struct wl_listener *listener, void *data)
     {
         return;
     }
+    diyac_init_foreign_toplevel(toplevel);
     /*
     wlr_xdg_toplevel_set_wm_capabilities(toplevel->xdg_toplevel,
                         WLR_XDG_TOPLEVEL_WM_CAPABILITIES_MAXIMIZE |
@@ -418,7 +419,6 @@ void diyac_new_xdg_toplevel(struct wl_listener *listener, void *data)
     wlr_scene_node_set_enabled(&toplevel->scene_tree->node, false);
     diyac_node_descriptor_create(&toplevel->scene_tree->node,
                                  DIYAC_NODE_VIEW, toplevel);
-    diyac_init_foreign_toplevel(toplevel);
 
     /* Listen to the various events it can emit */
     toplevel->map.notify = xdg_toplevel_map;