diff --git a/src/renderer/src/hooks/useAssistant.ts b/src/renderer/src/hooks/useAssistant.ts
index 513b67cd..1074569a 100644
--- a/src/renderer/src/hooks/useAssistant.ts
+++ b/src/renderer/src/hooks/useAssistant.ts
@@ -1,3 +1,4 @@
+import { db } from '@renderer/databases'
 import { getDefaultTopic } from '@renderer/services/AssistantService'
 import { useAppDispatch, useAppSelector } from '@renderer/store'
 import {
@@ -50,8 +51,20 @@ export function useAssistant(id: string) {
       dispatch(removeTopic({ assistantId: assistant.id, topic }))
     },
     moveTopic: (topic: Topic, toAssistant: Assistant) => {
-      dispatch(addTopic({ assistantId: toAssistant.id, topic: { ...topic } }))
+      dispatch(addTopic({ assistantId: toAssistant.id, topic: { ...topic, assistantId: toAssistant.id } }))
       dispatch(removeTopic({ assistantId: assistant.id, topic }))
+      // update topic messages in database
+      db.topics
+        .where('id')
+        .equals(topic.id)
+        .modify((dbTopic) => {
+          if (dbTopic.messages) {
+            dbTopic.messages = dbTopic.messages.map((message) => ({
+              ...message,
+              assistantId: toAssistant.id
+            }))
+          }
+        })
     },
     updateTopic: (topic: Topic) => dispatch(updateTopic({ assistantId: assistant.id, topic })),
     updateTopics: (topics: Topic[]) => dispatch(updateTopics({ assistantId: assistant.id, topics })),
diff --git a/src/renderer/src/pages/history/HistoryPage.tsx b/src/renderer/src/pages/history/HistoryPage.tsx
index a4e75471..bc0f45c9 100644
--- a/src/renderer/src/pages/history/HistoryPage.tsx
+++ b/src/renderer/src/pages/history/HistoryPage.tsx
@@ -21,6 +21,7 @@ let _message: Message | undefined
 const TopicsPage: FC = () => {
   const { t } = useTranslation()
   const [search, setSearch] = useState(_search)
+  const [searchKeywords, setSearchKeywords] = useState(_search)
   const [stack, setStack] = useState<Route[]>(_stack)
   const [topic, setTopic] = useState<Topic | undefined>(_topic)
   const [message, setMessage] = useState<Message | undefined>(_message)
@@ -40,6 +41,7 @@ const TopicsPage: FC = () => {
   }
 
   const onSearch = () => {
+    setSearchKeywords(search)
     setStack(['topics', 'search'])
     setTopic(undefined)
   }
@@ -84,7 +86,7 @@ const TopicsPage: FC = () => {
       />
       <TopicMessages topic={topic} style={{ display: isShow('topic') }} />
       <SearchResults
-        keywords={isShow('search') ? search : ''}
+        keywords={isShow('search') ? searchKeywords : ''}
         onMessageClick={onMessageClick}
         onTopicClick={onTopicClick}
         style={{ display: isShow('search') }}
diff --git a/src/renderer/src/pages/history/components/SearchMessage.tsx b/src/renderer/src/pages/history/components/SearchMessage.tsx
index 5422ab57..41cc99ed 100644
--- a/src/renderer/src/pages/history/components/SearchMessage.tsx
+++ b/src/renderer/src/pages/history/components/SearchMessage.tsx
@@ -1,5 +1,6 @@
 import { ArrowRightOutlined } from '@ant-design/icons'
 import { HStack } from '@renderer/components/Layout'
+import { useSettings } from '@renderer/hooks/useSettings'
 import { default as MessageItem } from '@renderer/pages/home/Messages/Message'
 import { locateToMessage } from '@renderer/services/MessagesService'
 import NavigationService from '@renderer/services/NavigationService'
@@ -15,6 +16,7 @@ interface Props extends React.HTMLAttributes<HTMLDivElement> {
 
 const SearchMessage: FC<Props> = ({ message, ...props }) => {
   const navigate = NavigationService.navigate!
+  const { messageStyle } = useSettings()
   const { t } = useTranslation()
 
   if (!message) {
@@ -22,7 +24,7 @@ const SearchMessage: FC<Props> = ({ message, ...props }) => {
   }
 
   return (
-    <MessagesContainer {...props}>
+    <MessagesContainer {...props} className={messageStyle}>
       <ContainerWrapper style={{ paddingTop: 20, paddingBottom: 20, position: 'relative' }}>
         <MessageItem message={message} />
         <Button
@@ -45,6 +47,7 @@ const SearchMessage: FC<Props> = ({ message, ...props }) => {
 const MessagesContainer = styled.div`
   width: 100%;
   display: flex;
+  flex: 1;
   flex-direction: column;
   align-items: center;
   overflow-y: scroll;