diff --git a/client/src/components/Chat/Menus/UI/TitleButton.tsx b/client/src/components/Chat/Menus/UI/TitleButton.tsx
index eb2055f214..8b942dcd10 100644
--- a/client/src/components/Chat/Menus/UI/TitleButton.tsx
+++ b/client/src/components/Chat/Menus/UI/TitleButton.tsx
@@ -5,7 +5,7 @@ export default function TitleButton({ primaryText = '', secondaryText = '' }) {
     <Trigger asChild>
       <div
         className="group flex cursor-pointer items-center gap-1 rounded-xl px-3 py-2 text-lg font-medium hover:bg-gray-50 radix-state-open:bg-gray-50 dark:hover:bg-black/10 dark:radix-state-open:bg-black/20"
-        // type="button"
+        data-testid="title-button"
       >
         <div>
           {primaryText}{' '}
diff --git a/e2e/specs/keys.spec.ts b/e2e/specs/keys.spec.ts
index 47d8a9924a..40f90e1b19 100644
--- a/e2e/specs/keys.spec.ts
+++ b/e2e/specs/keys.spec.ts
@@ -16,7 +16,7 @@ test.describe('Key suite', () => {
     await page.goto('http://localhost:3080/', { timeout: 5000 });
     const endpoint = 'chatGPTBrowser';
 
-    const newTopicButton = page.locator('.hide-scrollbar > .group');
+    const newTopicButton = page.getByTestId('title-button');
     await newTopicButton.click();
 
     const endpointItem = page.getByTestId(`endpoint-item-${endpoint}`);
@@ -53,7 +53,7 @@ test.describe('Key suite', () => {
     await page.goto('http://localhost:3080/', { timeout: 5000 });
     const endpoint = 'chatGPTBrowser';
 
-    const newTopicButton = page.locator('.hide-scrollbar > .group');
+    const newTopicButton = page.getByTestId('title-button');
     await newTopicButton.click();
 
     const endpointItem = page.getByTestId(`endpoint-item-${endpoint}`);
diff --git a/e2e/specs/messages.spec.ts b/e2e/specs/messages.spec.ts
index f9593c06c2..464f6b9d71 100644
--- a/e2e/specs/messages.spec.ts
+++ b/e2e/specs/messages.spec.ts
@@ -1,7 +1,7 @@
 import { expect, test } from '@playwright/test';
 import type { Response, Page, BrowserContext } from '@playwright/test';
 
-const basePath = 'http://localhost:3080/chat/';
+const basePath = 'http://localhost:3080/c/';
 const initialUrl = `${basePath}new`;
 const endpoints = ['google', 'openAI', 'azureOpenAI', 'bingAI', 'chatGPTBrowser', 'gptPlugins'];
 const endpoint = endpoints[1];
@@ -50,7 +50,7 @@ test.describe('Messaging suite', () => {
   test('textbox should be focused after generation, test expected navigation, & test editing messages', async ({
     page,
   }) => {
-    test.setTimeout(120000);
+    test.setTimeout(10000);
     const message = 'hi';
     await page.goto(initialUrl, { timeout: 5000 });
     await page.locator('#new-conversation-menu').click();