diff --git a/plugins/chat/assets/stylesheets/common/chat-message-actions.scss b/plugins/chat/assets/stylesheets/common/chat-message-actions.scss
index 371443e3290..05e03a1be68 100644
--- a/plugins/chat/assets/stylesheets/common/chat-message-actions.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-message-actions.scss
@@ -3,12 +3,6 @@
   z-index: z("dropdown");
 }
 
-.chat-message-actions {
-  .chat-message-reaction {
-    @include chat-reaction;
-  }
-}
-
 .chat-message-actions-container {
   @include unselectable;
   z-index: z("dropdown") - 1;
@@ -16,6 +10,7 @@
 
 .chat-message-actions {
   background-color: var(--secondary);
+  border-radius: var(--d-border-radius);
   display: flex;
 
   .emoji-picker-anchor {
@@ -138,6 +133,8 @@
   }
 
   .chat-message-reaction {
+    @include chat-reaction;
+
     align-items: center;
     border-radius: 0;
     border-left-color: transparent;
diff --git a/plugins/chat/assets/stylesheets/desktop/chat-message.scss b/plugins/chat/assets/stylesheets/desktop/chat-message.scss
index ddfea4214c9..bebface623d 100644
--- a/plugins/chat/assets/stylesheets/desktop/chat-message.scss
+++ b/plugins/chat/assets/stylesheets/desktop/chat-message.scss
@@ -8,6 +8,12 @@
     border-radius: 0;
     border-top-color: var(--primary-300);
 
+    &:first-child {
+      border-left-color: var(--primary-300);
+      border-top-left-radius: var(--d-border-radius);
+      border-bottom-left-radius: var(--d-border-radius);
+    }
+
     &:hover {
       background: var(--primary-low);
       border-color: var(--primary-low-mid);