diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index 61782c02..74b0bf10 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Upcomming
+
+🐞 Fixed
+- Fix render overflow issue with `MessageSearchListTileTitle`. It now uses `Text.rich` instead of `Row`. Better default behaviour and allows `TextOverflow`.
 ## 5.1.0
 
 🐞 Fixed
diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_tile.dart b/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_tile.dart
index bebe3a74..5aab3b2d 100644
--- a/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_tile.dart
+++ b/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_tile.dart
@@ -122,7 +122,8 @@ class StreamMessageSearchListTile extends StatelessWidget {
     final title = this.title ??
         MessageSearchListTileTitle(
           messageResponse: messageResponse,
-          textStyle: channelPreviewTheme.titleStyle,
+          textStyle: channelPreviewTheme.titleStyle
+              ?.copyWith(overflow: TextOverflow.ellipsis),
         );
 
     final subtitle = this.subtitle ??
@@ -177,27 +178,28 @@ class MessageSearchListTileTitle extends StatelessWidget {
     final channel = messageResponse.channel;
     final channelName = channel?.extraData['name'];
 
-    return Row(
-      children: [
-        Text(
-          user.id == StreamChat.of(context).currentUser?.id
-              ? context.translations.youText
-              : user.name,
-          style: textStyle,
-        ),
-        if (channelName != null) ...[
-          Text(
-            ' ${context.translations.inText} ',
-            style: textStyle?.copyWith(
-              fontWeight: FontWeight.normal,
+    return Text.rich(
+      TextSpan(
+        children: [
+          TextSpan(
+            text: user.id == StreamChat.of(context).currentUser?.id
+                ? context.translations.youText
+                : user.name,
+          ),
+          if (channelName != null) ...[
+            TextSpan(
+              text: ' ${context.translations.inText} ',
+              style: textStyle?.copyWith(
+                fontWeight: FontWeight.normal,
+              ),
             ),
-          ),
-          Text(
-            channelName as String,
-            style: textStyle,
-          ),
+            TextSpan(
+              text: channelName as String,
+            ),
+          ],
         ],
-      ],
+      ),
+      style: textStyle,
     );
   }
 }