diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81f7a168..f00b5d15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -73,6 +73,10 @@
 ### Deprecated
 ### Removed
 ### Fixed
+
+* Search mode: composing keys not ignored.
+
+
 ### Security
 ### Contributors
 
diff --git a/search.c b/search.c
index 5a2b6236..5228bf61 100644
--- a/search.c
+++ b/search.c
@@ -1484,7 +1484,8 @@ search_input(struct seat *seat, struct terminal *term,
         count = xkb_compose_state_get_utf8(
             seat->kbd.xkb_compose_state, (char *)buf, sizeof(buf));
         xkb_compose_state_reset(seat->kbd.xkb_compose_state);
-    } else if (compose_status == XKB_COMPOSE_CANCELLED) {
+    } else if (compose_status == XKB_COMPOSE_CANCELLED ||
+               compose_status == XKB_COMPOSE_COMPOSING) {
         count = 0;
     } else {
         count = xkb_state_key_get_utf8(