diff --git a/app/components/chat.tsx b/app/components/chat.tsx
index c5c257e54..8d9ee0c4e 100644
--- a/app/components/chat.tsx
+++ b/app/components/chat.tsx
@@ -622,7 +622,12 @@ export function Chat(props: {
                     {Locale.Chat.Typing}
                   </div>
                 )}
-                <div className={styles["chat-message-item"]}>
+                <div
+                  className={`${styles["chat-message-item"]} ${
+                    (message.preview || message.streaming) &&
+                    styles["chat-message-typing"]
+                  }`}
+                >
                   {!isUser &&
                     !(message.preview || message.content.length === 0) && (
                       <div className={styles["chat-message-top-actions"]}>
diff --git a/app/components/home.module.scss b/app/components/home.module.scss
index e20fa63e9..d2b401178 100644
--- a/app/components/home.module.scss
+++ b/app/components/home.module.scss
@@ -259,6 +259,10 @@
   line-height: 1.5;
   margin-top: 5px;
 }
+.chat-message-typing {
+  background-color: #FFEB3B !important;
+}
+
 
 .user-avtar {
   height: 30px;