diff --git a/src/renderer/src/components/ContextMenu/index.tsx b/src/renderer/src/components/ContextMenu/index.tsx
index 1beecf2c5a..610afa695f 100644
--- a/src/renderer/src/components/ContextMenu/index.tsx
+++ b/src/renderer/src/components/ContextMenu/index.tsx
@@ -1,41 +1,15 @@
 import { Dropdown } from 'antd'
-import { useCallback, useEffect, useMemo, useState } from 'react'
+import { useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import styled from 'styled-components'
 
 interface ContextMenuProps {
   children: React.ReactNode
-  onContextMenu?: (e: React.MouseEvent) => void
 }
 
-const ContextMenu: React.FC<ContextMenuProps> = ({ children, onContextMenu }) => {
+const ContextMenu: React.FC<ContextMenuProps> = ({ children }) => {
   const { t } = useTranslation()
-  const [contextMenuPosition, setContextMenuPosition] = useState<{ x: number; y: number } | null>(null)
   const [selectedText, setSelectedText] = useState<string | undefined>(undefined)
 
-  const handleContextMenu = useCallback(
-    (e: React.MouseEvent) => {
-      e.preventDefault()
-      const _selectedText = window.getSelection()?.toString()
-      if (_selectedText) {
-        setContextMenuPosition({ x: e.clientX, y: e.clientY })
-        setSelectedText(_selectedText)
-      }
-      onContextMenu?.(e)
-    },
-    [onContextMenu]
-  )
-
-  useEffect(() => {
-    const handleClick = () => {
-      setContextMenuPosition(null)
-    }
-    document.addEventListener('click', handleClick)
-    return () => {
-      document.removeEventListener('click', handleClick)
-    }
-  }, [])
-
   const contextMenuItems = useMemo(() => {
     if (!selectedText) return []
 
@@ -76,16 +50,10 @@ const ContextMenu: React.FC<ContextMenuProps> = ({ children, onContextMenu }) =>
   }
 
   return (
-    <ContextContainer onContextMenu={handleContextMenu} className="context-menu-container">
-      {contextMenuPosition && (
-        <Dropdown onOpenChange={onOpenChange} menu={{ items: contextMenuItems }} trigger={['contextMenu']}>
-          {children}
-        </Dropdown>
-      )}
-    </ContextContainer>
+    <Dropdown onOpenChange={onOpenChange} menu={{ items: contextMenuItems }} trigger={['contextMenu']}>
+      {children}
+    </Dropdown>
   )
 }
 
-const ContextContainer = styled.div``
-
 export default ContextMenu
diff --git a/src/renderer/src/pages/home/Messages/Message.tsx b/src/renderer/src/pages/home/Messages/Message.tsx
index 855ff318e9..429fad61dd 100644
--- a/src/renderer/src/pages/home/Messages/Message.tsx
+++ b/src/renderer/src/pages/home/Messages/Message.tsx
@@ -1,4 +1,3 @@
-import ContextMenu from '@renderer/components/ContextMenu'
 import Scrollbar from '@renderer/components/Scrollbar'
 import { useMessageEditing } from '@renderer/context/MessageEditingContext'
 import { useAssistant } from '@renderer/hooks/useAssistant'
@@ -167,55 +166,47 @@ const MessageItem: FC<Props> = ({
       })}
       ref={messageContainerRef}
       style={{ ...style, alignItems: isBubbleStyle ? (isAssistantMessage ? undefined : 'end') : undefined }}>
-      <ContextMenu>
-        <MessageHeader
-          message={message}
-          assistant={assistant}
-          model={model}
-          key={getModelUniqId(model)}
-          topic={topic}
-        />
-        <MessageContentContainer
-          className={
-            message.role === 'user'
-              ? 'message-content-container message-content-container-user'
-              : message.role === 'assistant'
-                ? 'message-content-container message-content-container-assistant'
-                : 'message-content-container'
-          }
+      <MessageHeader message={message} assistant={assistant} model={model} key={getModelUniqId(model)} topic={topic} />
+      <MessageContentContainer
+        className={
+          message.role === 'user'
+            ? 'message-content-container message-content-container-user'
+            : message.role === 'assistant'
+              ? 'message-content-container message-content-container-assistant'
+              : 'message-content-container'
+        }
+        style={{
+          fontFamily: messageFont === 'serif' ? 'var(--font-family-serif)' : 'var(--font-family)',
+          fontSize,
+          background: messageBackground,
+          overflowY: 'visible'
+        }}>
+        <MessageErrorBoundary>
+          <MessageContent message={message} />
+        </MessageErrorBoundary>
+      </MessageContentContainer>
+      {showMenubar && (
+        <MessageFooter
+          className="MessageFooter"
           style={{
-            fontFamily: messageFont === 'serif' ? 'var(--font-family-serif)' : 'var(--font-family)',
-            fontSize,
-            background: messageBackground,
-            overflowY: 'visible'
+            border: messageBorder,
+            flexDirection: isLastMessage || isBubbleStyle ? 'row-reverse' : undefined
           }}>
-          <MessageErrorBoundary>
-            <MessageContent message={message} />
-          </MessageErrorBoundary>
-        </MessageContentContainer>
-        {showMenubar && (
-          <MessageFooter
-            className="MessageFooter"
-            style={{
-              border: messageBorder,
-              flexDirection: isLastMessage || isBubbleStyle ? 'row-reverse' : undefined
-            }}>
-            <MessageTokens message={message} isLastMessage={isLastMessage} />
-            <MessageMenubar
-              message={message}
-              assistant={assistant}
-              model={model}
-              index={index}
-              topic={topic}
-              isLastMessage={isLastMessage}
-              isAssistantMessage={isAssistantMessage}
-              isGrouped={isGrouped}
-              messageContainerRef={messageContainerRef as React.RefObject<HTMLDivElement>}
-              setModel={setModel}
-            />
-          </MessageFooter>
-        )}
-      </ContextMenu>
+          <MessageTokens message={message} isLastMessage={isLastMessage} />
+          <MessageMenubar
+            message={message}
+            assistant={assistant}
+            model={model}
+            index={index}
+            topic={topic}
+            isLastMessage={isLastMessage}
+            isAssistantMessage={isAssistantMessage}
+            isGrouped={isGrouped}
+            messageContainerRef={messageContainerRef as React.RefObject<HTMLDivElement>}
+            setModel={setModel}
+          />
+        </MessageFooter>
+      )}
     </MessageContainer>
   )
 }