diff --git a/frontend/src/features/chat/components/ChatWindow.js b/frontend/src/features/chat/components/ChatWindow.js
index 65268f3..b33c3a9 100644
--- a/frontend/src/features/chat/components/ChatWindow.js
+++ b/frontend/src/features/chat/components/ChatWindow.js
@@ -213,26 +213,28 @@
         </div>
       )}
 
-      {!message.isUser && message.status && (
-        <div className="mt-2 pt-2 border-t border-gray-100 dark:border-gray-800 transition-all duration-300">
-          <div className="status-chip text-[10px] sm:text-xs text-indigo-600 dark:text-indigo-300 font-semibold italic flex items-center gap-2">
-            <div className={`w-2 h-2 rounded-full ${
-              typeof message.status === 'string' && (message.status.toLowerCase().includes("complete") || message.status.toLowerCase().includes("finished"))
-                ? "bg-emerald-500" 
-                : "bg-indigo-500 animate-pulse"
-            }`}></div>
-            <span className={
-              typeof message.status === 'string' &&
-                !message.status.toLowerCase().includes("finished") &&
-                !message.status.toLowerCase().includes("complete") &&
-                !message.status.startsWith("Thought for")
-                ? "streaming-dots" : ""
-            }>
-              {message.status}
-            </span>
+      {!message.isUser && message.status && (() => {
+        const isTerminal = typeof message.status === 'string' && (message.status.toLowerCase().includes("complete") || message.status.toLowerCase().includes("finished"));
+        return (
+          <div className="mt-2 pt-2 border-t border-gray-100 dark:border-gray-800 transition-all duration-300">
+            <div className={`status-chip text-[10px] sm:text-xs font-semibold italic flex items-center gap-2 py-1 px-3 rounded-full border ${
+              isTerminal 
+                ? "bg-emerald-500/10 border-emerald-500/20 text-emerald-600 dark:text-emerald-400" 
+                : "bg-indigo-500/10 border-indigo-500/20 text-indigo-600 dark:text-indigo-300"
+            }`}>
+              <div className={`w-2 h-2 rounded-full ${
+                isTerminal ? "bg-emerald-500" : "bg-indigo-500 animate-pulse"
+              }`}></div>
+              <span className={
+                typeof message.status === 'string' && !isTerminal && !message.status.startsWith("Thought for")
+                  ? "streaming-dots" : ""
+              }>
+                {message.status}
+              </span>
+            </div>
           </div>
-        </div>
-      )}
+        );
+      })()}
 
       {(message.isPureAnswer || !message.isUser) && (
         <div className="justify-end items-center mt-2 group-audio-container">