diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/chat_page.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/chat_page.dart
index ee39fb8adc..551a210d00 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/chat_page.dart
+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/chat_page.dart
@@ -191,14 +191,8 @@ class _ChatContentPage extends StatelessWidget {
       );
     }
 
-    if (message.author.id == userProfile.id.toString()) {
-      return ChatUserMessageWidget(
-        user: message.author,
-        message: message,
-      );
-    }
-
-    if (isOtherUserMessage(message)) {
+    if (message.author.id == userProfile.id.toString() ||
+        isOtherUserMessage(message)) {
       return ChatUserMessageWidget(
         user: message.author,
         message: message,
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/user_message_bubble.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/user_message_bubble.dart
index 81aab4d555..8f897fc8a1 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/user_message_bubble.dart
+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/user_message_bubble.dart
@@ -42,10 +42,9 @@ class ChatUserMessageBubble extends StatelessWidget {
             const VSpace(6),
           ],
           Row(
-            mainAxisSize: MainAxisSize.min,
             crossAxisAlignment: CrossAxisAlignment.start,
+            mainAxisAlignment: MainAxisAlignment.end,
             children: [
-              const Spacer(),
               _buildBubble(context),
               const HSpace(DesktopAIChatSizes.avatarAndChatBubbleSpacing),
               _buildAvatar(),