diff --git a/.github/workflows/jan-electron-linter-and-test.yml b/.github/workflows/jan-electron-linter-and-test.yml
index 14d4f4f4e..a9f934cfd 100644
--- a/.github/workflows/jan-electron-linter-and-test.yml
+++ b/.github/workflows/jan-electron-linter-and-test.yml
@@ -111,7 +111,7 @@ jobs:
           CSC_IDENTITY_AUTO_DISCOVERY: "false"
 
   test-on-windows:
-    if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
+    if: github.event_name == 'push'
     strategy:
       fail-fast: false
       matrix:
diff --git a/electron/tests/e2e/hub.e2e.spec.ts b/electron/tests/e2e/hub.e2e.spec.ts
index d968e7641..23d4d0b6d 100644
--- a/electron/tests/e2e/hub.e2e.spec.ts
+++ b/electron/tests/e2e/hub.e2e.spec.ts
@@ -1,4 +1,4 @@
-import { test, appInfo } from '../config/fixtures'
+import { test, appInfo, page, TIMEOUT } from '../config/fixtures'
 import { expect } from '@playwright/test'
 
 test.beforeAll(async () => {
@@ -16,4 +16,9 @@ test.beforeAll(async () => {
 test('explores hub', async ({ hubPage }) => {
   await hubPage.navigateByMenu()
   await hubPage.verifyContainerVisible()
+  const useModelBtn= page.getByTestId(/^use-model-btn-.*/).first()
+
+  await expect(useModelBtn).toBeVisible({
+    timeout: TIMEOUT,
+  })
 })
diff --git a/electron/tests/e2e/thread.e2e.spec.ts b/electron/tests/e2e/thread.e2e.spec.ts
new file mode 100644
index 000000000..c13e91119
--- /dev/null
+++ b/electron/tests/e2e/thread.e2e.spec.ts
@@ -0,0 +1,35 @@
+import { expect } from '@playwright/test'
+import { page, test, TIMEOUT } from '../config/fixtures'
+
+test('Select GPT model from Hub and Chat with Invalid API Key', async ({ hubPage }) => {
+  await hubPage.navigateByMenu()
+  await hubPage.verifyContainerVisible()
+
+  // Select the first GPT model
+  await page
+    .locator('[data-testid^="use-model-btn"][data-testid*="gpt"]')
+    .first().click()
+
+  // Attempt to create thread and chat in Thread page
+  await page
+    .getByTestId('btn-create-thread')
+    .click()
+
+  await page
+    .getByTestId('txt-input-chat')
+    .fill('dummy value')
+
+  await page
+    .getByTestId('btn-send-chat')
+    .click()
+
+  await page.waitForFunction(() => {
+    const loaders = document.querySelectorAll('[data-testid$="loader"]');
+    return !loaders.length;
+  }, { timeout: TIMEOUT });
+
+  const APIKeyError = page.getByTestId('invalid-API-key-error')
+  await expect(APIKeyError).toBeVisible({
+    timeout: TIMEOUT,
+  })
+})
diff --git a/electron/tests/pages/basePage.ts b/electron/tests/pages/basePage.ts
index 4e16a3c23..1817bc731 100644
--- a/electron/tests/pages/basePage.ts
+++ b/electron/tests/pages/basePage.ts
@@ -8,8 +8,9 @@ export class BasePage {
   constructor(
     protected readonly page: Page,
     readonly action: CommonActions,
-    protected containerId: string
-  ) {}
+    protected containerId: string,
+  ) {
+  }
 
   public getValue(key: string) {
     return this.action.getValue(key)
@@ -24,7 +25,11 @@ export class BasePage {
   }
 
   async navigateByMenu() {
-    await this.page.getByTestId(this.menuId).first().click()
+    await this.clickFirstElement(this.menuId)
+  }
+
+  async clickFirstElement(testId: string) {
+    await this.page.getByTestId(testId).first().click()
   }
 
   async verifyContainerVisible() {
@@ -36,7 +41,7 @@ export class BasePage {
     await this.isElementVisible('img[alt="Jan - Logo"]')
   }
 
-  //wait and find a specific element with it's selector and return Visible
+  //wait and find a specific element with its selector and return Visible
   async isElementVisible(selector: any) {
     let isVisible = true
     await this.page
diff --git a/web/containers/Loader/GenerateResponse.tsx b/web/containers/Loader/GenerateResponse.tsx
index 457c44987..844123dd2 100644
--- a/web/containers/Loader/GenerateResponse.tsx
+++ b/web/containers/Loader/GenerateResponse.tsx
@@ -31,6 +31,7 @@ export default function GenerateResponse() {
         <div
           className="absolute left-0 top-0 h-full bg-gray-200"
           style={{ width: `${loader}%` }}
+          data-testid="response-loader"
         />
         <span className="relative z-10">Generating response...</span>
       </div>
diff --git a/web/containers/Loader/ModelStart.tsx b/web/containers/Loader/ModelStart.tsx
index f7bc04481..126044e01 100644
--- a/web/containers/Loader/ModelStart.tsx
+++ b/web/containers/Loader/ModelStart.tsx
@@ -40,6 +40,7 @@ export default function ModelStart() {
         <div
           className="absolute left-0 top-0 h-full bg-blue-200"
           style={{ width: `${loader}%` }}
+          data-testid="model-loader"
         />
         <span className="relative z-10">
           {stateModel.state === 'start' ? 'Starting' : 'Stopping'}
diff --git a/web/screens/Chat/ChatInput/index.tsx b/web/screens/Chat/ChatInput/index.tsx
index 9c54c8c89..0b13fcd8c 100644
--- a/web/screens/Chat/ChatInput/index.tsx
+++ b/web/screens/Chat/ChatInput/index.tsx
@@ -148,6 +148,7 @@ const ChatInput: React.FC = () => {
             'max-h-[400px] resize-none pr-20',
             fileUpload.length && 'rounded-t-none'
           )}
+          data-testid="txt-input-chat"
           style={{ height: '40px' }}
           ref={textareaRef}
           onKeyDown={onKeyDown}
@@ -320,6 +321,7 @@ const ChatInput: React.FC = () => {
           }
           themes="primary"
           className="min-w-[100px]"
+          data-testid="btn-send-chat"
           onClick={() => sendChatMessage(currentPrompt)}
         >
           Send
diff --git a/web/screens/Chat/ErrorMessage/index.tsx b/web/screens/Chat/ErrorMessage/index.tsx
index 60f4a9ada..69f822dad 100644
--- a/web/screens/Chat/ErrorMessage/index.tsx
+++ b/web/screens/Chat/ErrorMessage/index.tsx
@@ -43,7 +43,7 @@ const ErrorMessage = ({ message }: { message: ThreadMessage }) => {
       case ErrorCode.InvalidApiKey:
       case ErrorCode.InvalidRequestError:
         return (
-          <span>
+          <span data-testid="invalid-API-key-error">
             Invalid API key. Please check your API key from{' '}
             <button
               className="font-medium text-primary dark:text-blue-400"
diff --git a/web/screens/ExploreModels/ExploreModelItemHeader/index.tsx b/web/screens/ExploreModels/ExploreModelItemHeader/index.tsx
index 86af5e3dd..59f47366a 100644
--- a/web/screens/ExploreModels/ExploreModelItemHeader/index.tsx
+++ b/web/screens/ExploreModels/ExploreModelItemHeader/index.tsx
@@ -121,6 +121,7 @@ const ExploreModelItemHeader: React.FC<Props> = ({ model, onClick, open }) => {
             className="min-w-[98px]"
             onClick={onUseModelClick}
             disabled={serverEnabled}
+            data-testid={`use-model-btn-${model.id}`}
           >
             Use
           </Button>