diff --git a/CHANGELOG.md b/CHANGELOG.md
index 544d11735..9be03d578 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 * Add notifications for missed calls
 * Video call preview now accurately shows what is sent to remote
 * Fix: properly hide draft attachment during in-chat search
+* Fix: cancel in-chat search when back is pressed, instead of directly returning to chatlist
 
 ## v2.53.0
 2026-06
diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
index f0150e770..80b88c9f0 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
@@ -262,6 +262,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
               public void handleOnBackPressed() {
                 if (container.isInputOpen()) {
                   container.hideCurrentInput(composeText);
+                } else if (searchMenu != null) {
+                  searchCollapse();
                 } else {
                   handleReturnToConversationList();
                 }