diff --git a/wayland.c b/wayland.c
index 60b4f80d..3cc86429 100644
--- a/wayland.c
+++ b/wayland.c
@@ -862,11 +862,15 @@ struct terminal *
 wayl_terminal_from_surface(struct wayland *wayl, struct wl_surface *surface)
 {
     tll_foreach(wayl->terms, it) {
-        if (it->item->window->surface == surface)
+        if (it->item->window->surface == surface ||
+            it->item->window->search_surface == surface)
+        {
             return it->item;
+        }
     }
 
     assert(false);
+    LOG_WARN("surface %p doesn't map to a terminal", surface);
     return NULL;
 }