diff --git a/ui/client-app/src/components/ChatWindow.css b/ui/client-app/src/components/ChatWindow.css
index 8b923b7..910f1c5 100644
--- a/ui/client-app/src/components/ChatWindow.css
+++ b/ui/client-app/src/components/ChatWindow.css
@@ -73,7 +73,7 @@
     border-radius: 0.75rem;
 }
 
-.thinking-dots::after {
+.streaming-dots::after {
     content: '';
     animation: dots 1.5s steps(5, end) infinite;
 }
diff --git a/ui/client-app/src/components/ChatWindow.js b/ui/client-app/src/components/ChatWindow.js
index f7fc8f0..5a9d002 100644
--- a/ui/client-app/src/components/ChatWindow.js
+++ b/ui/client-app/src/components/ChatWindow.js
@@ -104,13 +104,13 @@
         <div className="mb-3 transition-all duration-300">
           <div className="status-chip text-[10px] sm:text-xs text-indigo-600 dark:text-indigo-300 font-semibold italic">
             <div className="w-2 h-2 bg-indigo-500 rounded-full animate-pulse"></div>
-            <span className={message.status === "Thinking" ? "thinking-dots" : ""}>
+            <span className={["Thinking", "Generating"].includes(message.status) ? "streaming-dots" : ""}>
               {message.status}
             </span>
           </div>
         </div>
       )}
-      {message.reasoning && (
+      {(message.reasoning || (message.status === "Thinking")) && (
         <div className="mb-3">
           <button
             onClick={toggleReasoning}
@@ -119,6 +119,7 @@
             <span className="text-[10px] transform transition-transform duration-200" style={{ transform: isReasoningExpanded ? 'rotate(90deg)' : 'rotate(0deg)' }}>▶</span>
             {message.status && message.status.startsWith("Thought for") ? message.status.toUpperCase() : "THOUGHT TRACE"}
           </button>
+
           <div
             className={`mt-2 text-xs transition-all duration-500 ease-in-out overflow-hidden thought-panel pl-4 pr-2 py-1 ${isReasoningExpanded ? "max-h-[800px] opacity-100 mb-2" : "max-h-0 opacity-0"
               } text-gray-600 dark:text-gray-400 font-light leading-relaxed`}
diff --git a/ui/client-app/src/hooks/useSwarmControl.js b/ui/client-app/src/hooks/useSwarmControl.js
index e90d9c9..a1bc392 100644
--- a/ui/client-app/src/hooks/useSwarmControl.js
+++ b/ui/client-app/src/hooks/useSwarmControl.js
@@ -135,16 +135,15 @@
     setChatHistory((prev) => [...prev, { isUser: true, text, timestamp: new Date().toISOString() }]);
 
     try {
-      const startTime = Date.now();
       let reasoningStartTime = null;
       let reasoningDuration = 0;
 
-      // Add a placeholder message for the AI that we will update live
+      // Add a placeholder message for the AI starting with 'Generating' status
       setChatHistory((prev) => [...prev, {
         isUser: false,
         text: "",
         reasoning: "",
-        status: "Thinking", // CSS animation will add the dots
+        status: "Generating", // Initially show 'Generating'
         provider: localActiveLLM,
         timestamp: new Date().toISOString()
       }]);
@@ -157,13 +156,14 @@
           if (event.type === "reasoning") {
             if (!reasoningStartTime) reasoningStartTime = Date.now();
             lastMsg.reasoning += event.content;
-            lastMsg.status = "Thinking";
+            lastMsg.status = "Thinking"; // Switch to Thinking if reasoning tokens arrive
           } else if (event.type === "content") {
             if (reasoningStartTime && !lastMsg.thoughtDone) {
               reasoningDuration = Math.round((Date.now() - reasoningStartTime) / 1000);
               lastMsg.status = `Thought for ${reasoningDuration}s`;
               lastMsg.thoughtDone = true;
-            } else if (!reasoningStartTime) {
+            } else if (!reasoningStartTime && lastMsg.status === "Generating") {
+              // Direct answer case: hide status once tokens start arriving
               lastMsg.status = null;
             }
             lastMsg.text += event.content;
@@ -188,6 +188,7 @@
       setIsProcessing(false);
     }
 
+
   }, [isConfigured, localActiveLLM, fetchTokenUsage]);
 
   const handleSwitchSession = useCallback(async (targetSessionId) => {