diff --git a/src/interface/web/app/chat/chat.module.css b/src/interface/web/app/chat/chat.module.css
index d0cc9e117..942087e62 100644
--- a/src/interface/web/app/chat/chat.module.css
+++ b/src/interface/web/app/chat/chat.module.css
@@ -95,7 +95,7 @@ div.agentIndicator {
 }
 
 div.chatTitleWrapper {
-    grid-template-columns: auto 1fr;
+    grid-template-columns: 1fr auto;
 }
 
 @media screen and (max-width: 768px) {
diff --git a/src/interface/web/app/components/chatHistory/chatHistory.tsx b/src/interface/web/app/components/chatHistory/chatHistory.tsx
index 46b0bc236..e42dc4ede 100644
--- a/src/interface/web/app/components/chatHistory/chatHistory.tsx
+++ b/src/interface/web/app/components/chatHistory/chatHistory.tsx
@@ -146,6 +146,7 @@ export default function ChatHistory(props: ChatHistoryProps) {
             const lastMessage = props.incomingMessages[props.incomingMessages.length - 1];
             if (lastMessage && !lastMessage.completed) {
                 setIncompleteIncomingMessageIndex(props.incomingMessages.length - 1);
+                props.setTitle(lastMessage.rawQuery);
             }
         }
     }, [props.incomingMessages]);