diff --git a/apps/meteor/client/components/Omnichannel/modals/ForwardChatModal.tsx b/apps/meteor/client/components/Omnichannel/modals/ForwardChatModal.tsx
index 0327eac2e9620..c7a581b14295c 100644
--- a/apps/meteor/client/components/Omnichannel/modals/ForwardChatModal.tsx
+++ b/apps/meteor/client/components/Omnichannel/modals/ForwardChatModal.tsx
@@ -113,15 +113,15 @@ const ForwardChatModal = ({
 						<FieldLabel>{t('Forward_to_user')}</FieldLabel>
 						<FieldRow>
 							<AutoCompleteAgent
-								onlyAvailable
 								withTitle
+								onlyAvailable
+								value={getValues().username}
 								excludeId={room.servedBy?._id}
 								showIdleAgents={idleAgentsAllowedForForwarding}
 								placeholder={t('Username')}
 								onChange={(value) => {
 									setValue('username', value);
 								}}
-								value={getValues().username}
 							/>
 						</FieldRow>
 					</Field>
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-transfer-to-another-agents.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-transfer-to-another-agents.spec.ts
index 3c74065a9a84e..39cea8cd18e87 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-transfer-to-another-agents.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-transfer-to-another-agents.spec.ts
@@ -65,6 +65,7 @@ test.describe('omnichannel-transfer-to-another-agent', () => {
 			await agent2.poHomeOmnichannel.sidenav.switchStatus('offline');
 
 			await agent1.poHomeOmnichannel.content.btnForwardChat.click();
+			await agent1.poHomeOmnichannel.content.inputModalAgentUserName.click();
 			await agent1.poHomeOmnichannel.content.inputModalAgentUserName.type('user2');
 			await expect(agent1.page.locator('text=Empty')).toBeVisible();
 
@@ -76,6 +77,7 @@ test.describe('omnichannel-transfer-to-another-agent', () => {
 
 			await agent1.poHomeOmnichannel.sidenav.getSidebarItemByName(newVisitor.name).click();
 			await agent1.poHomeOmnichannel.content.btnForwardChat.click();
+			await agent1.poHomeOmnichannel.content.inputModalAgentUserName.click();
 			await agent1.poHomeOmnichannel.content.inputModalAgentUserName.type('user2');
 			await agent1.page.locator('.rcx-option .rcx-option__wrapper >> text="user2"').click();
 			await agent1.poHomeOmnichannel.content.inputModalAgentForwardComment.type('any_comment');
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 cb8c8b089095b..ebbbb488bd386 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
@@ -197,7 +197,7 @@ export class HomeContent {
 	}
 
 	get inputModalAgentUserName(): Locator {
-		return this.page.locator('#modal-root input:nth-child(1)');
+		return this.page.locator('#modal-root input[placeholder="Username"]');
 	}
 
 	get inputModalAgentForwardComment(): Locator {
@@ -237,16 +237,8 @@ export class HomeContent {
 
 	async openLastThreadMessageMenu(): Promise<void> {
 		await this.page.locator('//main//aside >> [data-qa-type="message"]').last().hover();
-		await this.page
-			.locator('//main//aside >> [data-qa-type="message"]')
-			.last()
-			.locator('role=button[name="More"]')
-			.waitFor();
-		await this.page
-			.locator('//main//aside >> [data-qa-type="message"]')
-			.last()
-			.locator('role=button[name="More"]')
-			.click();
+		await this.page.locator('//main//aside >> [data-qa-type="message"]').last().locator('role=button[name="More"]').waitFor();
+		await this.page.locator('//main//aside >> [data-qa-type="message"]').last().locator('role=button[name="More"]').click();
 	}
 
 	async toggleAlsoSendThreadToChannel(isChecked: boolean): Promise<void> {