diff --git a/src/renderer/src/pages/home/Tabs/TopicsTab.tsx b/src/renderer/src/pages/home/Tabs/TopicsTab.tsx
index 6f5b95484d..490cfb3c29 100644
--- a/src/renderer/src/pages/home/Tabs/TopicsTab.tsx
+++ b/src/renderer/src/pages/home/Tabs/TopicsTab.tsx
@@ -174,7 +174,9 @@ const Topics: FC<Props> = ({ assistant: _assistant, activeTopic, setActiveTopic
           if (messages.length >= 2) {
             const summaryText = await fetchMessagesSummary({ messages, assistant })
             if (summaryText) {
-              updateTopic({ ...topic, name: summaryText, isNameManuallyEdited: false })
+              const updatedTopic = { ...topic, name: summaryText, isNameManuallyEdited: false }
+              updateTopic(updatedTopic)
+              topic.id === activeTopic.id && setActiveTopic(updatedTopic)
             } else {
               window.message?.error(t('message.error.fetchTopicName'))
             }
@@ -192,7 +194,9 @@ const Topics: FC<Props> = ({ assistant: _assistant, activeTopic, setActiveTopic
             defaultValue: topic?.name || ''
           })
           if (name && topic?.name !== name) {
-            updateTopic({ ...topic, name, isNameManuallyEdited: true })
+            const updatedTopic = { ...topic, name, isNameManuallyEdited: true }
+            updateTopic(updatedTopic)
+            topic.id === activeTopic.id && setActiveTopic(updatedTopic)
           }
         }
       },