diff --git a/lib/screens/channel/chat/widgets/reply_thread.dart b/lib/screens/channel/chat/widgets/reply_thread.dart
index 555bc3bf..ca321cd5 100644
--- a/lib/screens/channel/chat/widgets/reply_thread.dart
+++ b/lib/screens/channel/chat/widgets/reply_thread.dart
@@ -42,9 +42,9 @@ class ReplyThread extends StatelessWidget {
             style: DefaultTextStyle.of(context)
                 .style
                 .copyWith(fontSize: chatStore.settings.fontSize),
-            child: ListView(
-              shrinkWrap: true,
-              primary: false,
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisSize: MainAxisSize.min,
               children: [
                 const SectionHeader(
                   'Reply thread',
@@ -66,19 +66,26 @@ class ReplyThread extends StatelessWidget {
                       ),
                     ),
                   ),
-                ...chatStore.messages
-                    .where(
-                      (message) =>
-                          message.tags['reply-parent-msg-id'] ==
-                          selectedMessage.tags['reply-parent-msg-id'],
-                    )
-                    .map(
-                      (message) => ChatMessage(
-                        isModal: true,
-                        ircMessage: message,
-                        chatStore: chatStore,
-                      ),
-                    ),
+                Flexible(
+                  child: ListView(
+                    shrinkWrap: true,
+                    primary: false,
+                    children: chatStore.messages
+                        .where(
+                          (message) =>
+                              message.tags['reply-parent-msg-id'] ==
+                              selectedMessage.tags['reply-parent-msg-id'],
+                        )
+                        .map(
+                          (message) => ChatMessage(
+                            isModal: true,
+                            ircMessage: message,
+                            chatStore: chatStore,
+                          ),
+                        )
+                        .toList(),
+                  ),
+                ),
               ],
             ),
           ),