diff --git a/frontend/src/components/CopyButton.tsx b/frontend/src/components/CopyButton.tsx
index b7f6be7f59..fb4fedfff6 100644
--- a/frontend/src/components/CopyButton.tsx
+++ b/frontend/src/components/CopyButton.tsx
@@ -57,7 +57,11 @@ const CopyButton = ({ content, className }: Props) => {
           </Button>
         </TooltipTrigger>
         <TooltipContent>
-          <p>{copied ? t('actions.copy.success') : t('actions.copy.button')}</p>
+          <p>
+            {copied
+              ? t('chat.messages.actions.copy.success')
+              : t('chat.messages.actions.copy.button')}
+          </p>
         </TooltipContent>
       </Tooltip>
     </TooltipProvider>
diff --git a/frontend/src/components/chat/MessageComposer/index.tsx b/frontend/src/components/chat/MessageComposer/index.tsx
index 9657a33da5..7e213258f6 100644
--- a/frontend/src/components/chat/MessageComposer/index.tsx
+++ b/frontend/src/components/chat/MessageComposer/index.tsx
@@ -52,7 +52,6 @@ export default function MessageComposer({
   const disabled = _disabled || !!attachments.find((a) => !a.uploaded);
 
   const onPaste = useCallback((event: ClipboardEvent) => {
-    event.preventDefault();
     if (event.clipboardData && event.clipboardData.items) {
       const items = Array.from(event.clipboardData.items);
 
@@ -63,6 +62,8 @@ export default function MessageComposer({
         return;
       }
 
+      event.preventDefault();
+
       // If no text data, check for files (e.g., images)
       items.forEach((item) => {
         if (item.kind === 'file') {