diff --git a/apps/meteor/tests/e2e/channel-management.spec.ts b/apps/meteor/tests/e2e/channel-management.spec.ts
index d74e91acab303..406c1a594e3bc 100644
--- a/apps/meteor/tests/e2e/channel-management.spec.ts
+++ b/apps/meteor/tests/e2e/channel-management.spec.ts
@@ -3,6 +3,7 @@ import type { Page } from '@playwright/test';
 
 import { Users } from './fixtures/userStates';
 import { HomeChannel } from './page-objects';
+import { CreateNewDiscussionModal } from './page-objects/fragments';
 import { createTargetChannel } from './utils';
 import { test, expect } from './utils/test';
 
@@ -148,8 +149,9 @@ test.describe.serial('channel-management', () => {
 		await poHomeChannel.navbar.openChat(targetChannel);
 		await poHomeChannel.composer.btnMenuMoreActions.click();
 		await page.getByRole('menuitem', { name: 'Discussion' }).click();
-		await poHomeChannel.content.inputDiscussionName.fill(discussionName);
-		await poHomeChannel.content.btnCreateDiscussionModal.click();
+		const createDiscussionModal = new CreateNewDiscussionModal(page);
+		await createDiscussionModal.inputName.fill(discussionName);
+		await createDiscussionModal.create();
 
 		await expect(page.getByRole('heading', { name: discussionName })).toBeVisible();
 	});
diff --git a/apps/meteor/tests/e2e/feature-preview.spec.ts b/apps/meteor/tests/e2e/feature-preview.spec.ts
index 260da835e3a1a..9d6763c2ecb71 100644
--- a/apps/meteor/tests/e2e/feature-preview.spec.ts
+++ b/apps/meteor/tests/e2e/feature-preview.spec.ts
@@ -2,7 +2,7 @@ import { faker } from '@faker-js/faker';
 
 import { Users } from './fixtures/userStates';
 import { AdminInfo, HomeChannel, HomeDiscussion, HomeTeam } from './page-objects';
-import { CreateNewChannelModal } from './page-objects/fragments/modals';
+import { CreateNewChannelModal, CreateNewDiscussionModal } from './page-objects/fragments/modals';
 import {
 	createTargetChannel,
 	createTargetTeam,
@@ -246,8 +246,9 @@ test.describe.serial('feature preview', () => {
 
 			await poHomeChannel.composer.btnMenuMoreActions.click();
 			await page.getByRole('menuitem', { name: 'Discussion' }).click();
-			await poHomeChannel.content.inputDiscussionName.fill(discussionName);
-			await poHomeChannel.content.btnCreateDiscussionModal.click();
+			const createDiscussionModal = new CreateNewDiscussionModal(page);
+			await createDiscussionModal.inputName.fill(discussionName);
+			await createDiscussionModal.create();
 			await expect(page.getByRole('heading', { name: discussionName })).toBeVisible();
 
 			await poHomeDiscussion.sidebar.discussionsTeamCollabFilter.click();
@@ -570,8 +571,9 @@ test.describe.serial('feature preview', () => {
 			await test.step('create discussion in DM', async () => {
 				await poHomeChannel.composer.btnMenuMoreActions.click();
 				await page.getByRole('menuitem', { name: 'Discussion' }).click();
-				await poHomeChannel.content.inputDiscussionName.fill(discussionName);
-				await poHomeChannel.content.btnCreateDiscussionModal.click();
+				const createDiscussionModal = new CreateNewDiscussionModal(page);
+				await createDiscussionModal.inputName.fill(discussionName);
+				await createDiscussionModal.create();
 				await poHomeChannel.content.waitForChannel();
 				await poHomeChannel.content.sendMessage('hello');
 
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts b/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
index a17e56af0e652..991a980f79852 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
@@ -180,18 +180,6 @@ export class HomeContent {
 		return this.page.getByRole('dialog', { name: 'File Upload' });
 	}
 
-	get createDiscussionModal(): Locator {
-		return this.page.getByRole('dialog', { name: 'Create discussion' });
-	}
-
-	get inputDiscussionName(): Locator {
-		return this.createDiscussionModal.getByRole('textbox', { name: 'Name' });
-	}
-
-	get btnCreateDiscussionModal(): Locator {
-		return this.createDiscussionModal.getByRole('button', { name: 'Create' });
-	}
-
 	get btnModalConfirm(): Locator {
 		return this.page.locator('#modal-root .rcx-button-group--align-end .rcx-button--primary');
 	}
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/modals/create-new-modal.ts b/apps/meteor/tests/e2e/page-objects/fragments/modals/create-new-modal.ts
index 4ba0cadc3f317..66b1e237d29fd 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/modals/create-new-modal.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/modals/create-new-modal.ts
@@ -45,6 +45,11 @@ export abstract class CreateNewModal extends Modal {
 		await this.listbox.selectOption(memberName);
 		await this.inputAddMembers.click();
 	}
+
+	async create() {
+		await this.btnCreate.click();
+		await this.waitForDismissal();
+	}
 }
 
 export class CreateNewChannelModal extends CreateNewModal {