diff --git a/packages/stream_chat_flutter/lib/src/message_input.dart b/packages/stream_chat_flutter/lib/src/message_input.dart
index e383173c..32d1eab8 100644
--- a/packages/stream_chat_flutter/lib/src/message_input.dart
+++ b/packages/stream_chat_flutter/lib/src/message_input.dart
@@ -417,19 +417,21 @@ class MessageInputState extends State<MessageInput> {
           ),
           splashRadius: 24,
         ),
-        secondChild: Row(
-          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-          children: [
-            if (!widget.disableAttachments) _buildAttachmentButton(),
-            if (widget.editMessage == null &&
-                StreamChannel.of(context)
-                        .channel
-                        ?.config
-                        ?.commands
-                        ?.isNotEmpty ==
-                    true)
-              _buildCommandButton(),
-          ].insertBetween(const SizedBox(width: 8)),
+        secondChild: FittedBox(
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+            children: [
+              if (!widget.disableAttachments) _buildAttachmentButton(),
+              if (widget.editMessage == null &&
+                  StreamChannel.of(context)
+                          .channel
+                          ?.config
+                          ?.commands
+                          ?.isNotEmpty ==
+                      true)
+                _buildCommandButton(),
+            ].insertBetween(const SizedBox(width: 8)),
+          ),
         ),
         duration: Duration(milliseconds: 300),
         alignment: Alignment.center,