diff --git a/ui/src/styles/chat/grouped.css b/ui/src/styles/chat/grouped.css
index ac795ce2f4c..e82e78f590a 100644
--- a/ui/src/styles/chat/grouped.css
+++ b/ui/src/styles/chat/grouped.css
@@ -24,11 +24,12 @@
   gap: 2px;
   flex: 1 1 auto;
   max-width: min(900px, 68%);
+  align-items: flex-start;
 }
 
 /* User messages align content right */
 .chat-group.user .chat-group-messages {
-  align-items: stretch;
+  align-items: flex-end;
 }
 
 @media (max-width: 600px) {
@@ -195,7 +196,7 @@ img.chat-avatar {
   transition:
     background var(--duration-fast) ease-out,
     border-color var(--duration-fast) ease-out;
-  width: 100%;
+  width: auto;
   max-width: 100%;
   box-sizing: border-box;
   word-wrap: break-word;