diff --git a/src/backend/wayland/wl_handlers.c b/src/backend/wayland/wl_handlers.c
index d69d210..86a5fe4 100644
--- a/src/backend/wayland/wl_handlers.c
+++ b/src/backend/wayland/wl_handlers.c
@@ -229,15 +229,11 @@ handle_pointer_button(struct wl_listener *listener, void *data)
                         break;
                     }
                 }
-                wev.window = _wtb ? _wtb->id : _tv->id;
+                WObjDescriptor *_wd = wm_backend->context_find(_wtb->id, WM_CTX_CLIENT_WIN);
+                wev.window = _wd ? _wtb->id : _tv->id;
                 wev.u.button.window = wev.window;
                 wev.u.button.x = (int)_sx;
                 wev.u.button.y = (int)_sy;
-                wwarning("btn-route: ptr=(%d,%d) tv=0x%lx surf=%p sxsy=(%.1f,%.1f) wings_fb=%s final=0x%lx local=(%d,%d)",
-                         wl_state.pointer_x, wl_state.pointer_y,
-                         (unsigned long)_tv->id, (void*)_surf, _sx, _sy,
-                         _wtb ? "yes" : "no", (unsigned long)wev.window,
-                         wev.u.button.x, wev.u.button.y);
             } else {
                 struct wl_frame_buf *fb = frame_buf_hit(wl_state.pointer_x,
                                                         wl_state.pointer_y);