diff --git a/src/components/MessageActions/Copy.tsx b/src/components/MessageActions/Copy.tsx
index f2509f4..7a3d518 100644
--- a/src/components/MessageActions/Copy.tsx
+++ b/src/components/MessageActions/Copy.tsx
@@ -21,15 +21,16 @@ const Copy = ({
         ) as SourceBlock[];
 
         const contentToCopy = `${initialMessage}${
-          sources.length > 0 &&
-          `\n\nCitations:\n${sources
-            .map((source) => source.data)
-            .flat()
-            .map(
-              (s, i) =>
-                `[${i + 1}] ${s.metadata.url.startsWith('file_id://') ? s.metadata.fileName || 'Uploaded File' : s.metadata.url}`,
-            )
-            .join(`\n`)}`
+          sources.length > 0
+            ? `\n\nCitations:\n${sources
+                .map((source) => source.data)
+                .flat()
+                .map(
+                  (s, i) =>
+                    `[${i + 1}] ${s.metadata.url.startsWith('file_id://') ? s.metadata.fileName || 'Uploaded File' : s.metadata.url}`,
+                )
+                .join(`\n`)}`
+            : ''
         }`;
 
         navigator.clipboard.writeText(contentToCopy);
diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx
index ae32685..6d3e77c 100644
--- a/src/components/Navbar.tsx
+++ b/src/components/Navbar.tsx
@@ -205,8 +205,9 @@ const Navbar = () => {
   useEffect(() => {
     if (sections.length > 0 && sections[0].message) {
       const newTitle =
-        sections[0].message.query.substring(0, 30) + '...' ||
-        'New Conversation';
+        sections[0].message.query.length > 30
+          ? `${sections[0].message.query.substring(0, 30).trim()}...`
+          : sections[0].message.query || 'New Conversation';
 
       setTitle(newTitle);
       const newTimeAgo = formatTimeDifference(