diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index 1fbb833e7..1a0404ebe 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 - Messages by default now show an "Edited" label if text is edited. Use `showEditedLabel` to disable this functionality. 
 
+🐞 Fixed
+
+- Reactions now scroll if count is too high.
+
 ## 8.1.0
 
 🐞 Fixed
diff --git a/packages/stream_chat_flutter/lib/src/message_widget/reactions/reaction_picker.dart b/packages/stream_chat_flutter/lib/src/message_widget/reactions/reaction_picker.dart
index 5298f88aa..b1fdd6419 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/reactions/reaction_picker.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/reactions/reaction_picker.dart
@@ -57,69 +57,72 @@ class _StreamReactionPickerState extends State<StreamReactionPicker>
           horizontal: 16,
           vertical: 8,
         ),
-        child: Row(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          mainAxisAlignment: MainAxisAlignment.end,
-          mainAxisSize: MainAxisSize.min,
-          children: reactionIcons
-              .map<Widget>((reactionIcon) {
-                final ownReactionIndex =
-                    widget.message.ownReactions?.indexWhere(
-                          (reaction) => reaction.type == reactionIcon.type,
-                        ) ??
-                        -1;
-                final index = reactionIcons.indexOf(reactionIcon);
-
-                final child = reactionIcon.builder(
-                  context,
-                  ownReactionIndex != -1,
-                  24,
-                );
-
-                return ConstrainedBox(
-                  constraints: const BoxConstraints.tightFor(
-                    height: 24,
-                    width: 24,
-                  ),
-                  child: RawMaterialButton(
-                    elevation: 0,
-                    shape: ContinuousRectangleBorder(
-                      borderRadius: BorderRadius.circular(16),
-                    ),
+        child: SingleChildScrollView(
+          scrollDirection: Axis.horizontal,
+          child: Row(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            mainAxisAlignment: MainAxisAlignment.end,
+            mainAxisSize: MainAxisSize.min,
+            children: reactionIcons
+                .map<Widget>((reactionIcon) {
+                  final ownReactionIndex =
+                      widget.message.ownReactions?.indexWhere(
+                            (reaction) => reaction.type == reactionIcon.type,
+                          ) ??
+                          -1;
+                  final index = reactionIcons.indexOf(reactionIcon);
+
+                  final child = reactionIcon.builder(
+                    context,
+                    ownReactionIndex != -1,
+                    24,
+                  );
+
+                  return ConstrainedBox(
                     constraints: const BoxConstraints.tightFor(
                       height: 24,
                       width: 24,
                     ),
-                    onPressed: () {
-                      if (ownReactionIndex != -1) {
-                        removeReaction(
-                          context,
-                          widget.message.ownReactions![ownReactionIndex],
-                        );
-                      } else {
-                        sendReaction(
-                          context,
-                          reactionIcon.type,
-                        );
-                      }
-                    },
-                    child: AnimatedBuilder(
-                      animation: animations[index],
-                      builder: (context, child) => Transform.scale(
-                        scale: animations[index].value,
+                    child: RawMaterialButton(
+                      elevation: 0,
+                      shape: ContinuousRectangleBorder(
+                        borderRadius: BorderRadius.circular(16),
+                      ),
+                      constraints: const BoxConstraints.tightFor(
+                        height: 24,
+                        width: 24,
+                      ),
+                      onPressed: () {
+                        if (ownReactionIndex != -1) {
+                          removeReaction(
+                            context,
+                            widget.message.ownReactions![ownReactionIndex],
+                          );
+                        } else {
+                          sendReaction(
+                            context,
+                            reactionIcon.type,
+                          );
+                        }
+                      },
+                      child: AnimatedBuilder(
+                        animation: animations[index],
+                        builder: (context, child) => Transform.scale(
+                          scale: animations[index].value,
+                          child: child,
+                        ),
                         child: child,
                       ),
-                      child: child,
                     ),
+                  );
+                })
+                .insertBetween(
+                  const SizedBox(
+                    width: 16,
                   ),
-                );
-              })
-              .insertBetween(
-                const SizedBox(
-                  width: 16,
-                ),
-              )
-              .toList(),
+                )
+                .toList(),
+          ),
         ),
       ),
     );