diff --git a/app/src/main/java/org/thoughtcrime/securesms/main/MainToolbar.kt b/app/src/main/java/org/thoughtcrime/securesms/main/MainToolbar.kt
index afc49d51a8..ab077e8eec 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/main/MainToolbar.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/main/MainToolbar.kt
@@ -228,6 +228,22 @@ private fun SearchToolbar(
           )
         }
       },
+      trailingIcon = if (state.searchQuery.isNotEmpty()) {
+        {
+          IconButtons.IconButton(
+            onClick = {
+              callback.onSearchQueryUpdated("")
+            }
+          ) {
+            Icon(
+              imageVector = ImageVector.vectorResource(R.drawable.ic_x_20),
+              contentDescription = stringResource(R.string.MainToolbar__clear_search_content_description)
+            )
+          }
+        }
+      } else {
+        null
+      },
       contentPadding = PaddingValues(0.dp),
       colors = TextFieldDefaults.colors(
         focusedIndicatorColor = Color.Transparent,
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4fa0ff50e3..6718b6dc58 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8429,6 +8429,8 @@
 
     <!-- Accessibility label for close search button in MainToolbar -->
     <string name="MainToolbar__close_search_content_description">Close search</string>
+    <!-- Accessibility label for clear search query in MainToolbar -->
+    <string name="MainToolbar__clear_search_content_description">Clear search</string>
     <!-- Accessibility label for more options button in MainToolbar -->
     <string name="MainToolbar__more_options_content_description">More options</string>
     <!-- Accessibility label for more options button in MainToolbar -->