diff --git a/lib/src/message_reactions_modal.dart b/lib/src/message_reactions_modal.dart
index 99a48730..af1d81ee 100644
--- a/lib/src/message_reactions_modal.dart
+++ b/lib/src/message_reactions_modal.dart
@@ -66,12 +66,16 @@ class MessageReactionsModal extends StatelessWidget {
                         (message.status == MessageSendingStatus.SENT ||
                             message.status == null))
                       Align(
-                        alignment: Alignment(-0.3, 0.0),
-                        child: ReactionPicker(
-                          message: message,
-                          messageTheme: messageTheme,
-                        ),
-                      ),
+                          alignment: Alignment(-0.3, 0.0),
+                          child: Row(
+                            mainAxisSize: MainAxisSize.min,
+                            children: [
+                              ReactionPicker(
+                                message: message,
+                                messageTheme: messageTheme,
+                              ),
+                            ],
+                          )),
                     IgnorePointer(
                       child: MessageWidget(
                         key: Key('MessageWidget'),
diff --git a/lib/src/reaction_picker.dart b/lib/src/reaction_picker.dart
index 3a0600fe..e4a8bdf8 100644
--- a/lib/src/reaction_picker.dart
+++ b/lib/src/reaction_picker.dart
@@ -20,7 +20,6 @@ class ReactionPicker extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    var user = StreamChat.of(context).user;
     final reactionIcons = StreamChatTheme.of(context).reactionIcons;
     return Material(
       color: messageTheme.reactionsBackgroundColor,
@@ -32,12 +31,7 @@ class ReactionPicker extends StatelessWidget {
           crossAxisAlignment: CrossAxisAlignment.start,
           mainAxisAlignment: MainAxisAlignment.end,
           mainAxisSize: MainAxisSize.min,
-          children: [
-            if(user.id == message.id)
-              SizedBox(
-                width: 50.0,
-              ),
-            ...reactionIcons.map((reactionIcon) {
+          children: reactionIcons.map((reactionIcon) {
               final ownReactionIndex = message.ownReactions?.indexWhere(
                       (reaction) => reaction.type == reactionIcon.type) ??
                   -1;
@@ -64,7 +58,7 @@ class ReactionPicker extends StatelessWidget {
                 },
               );
             }).toList(),
-          ]),
+          ),
     );
   }