diff --git a/openvidu-components-angular/e2e/utils.po.test.ts b/openvidu-components-angular/e2e/utils.po.test.ts
index 5bff8307..8ece4e96 100644
--- a/openvidu-components-angular/e2e/utils.po.test.ts
+++ b/openvidu-components-angular/e2e/utils.po.test.ts
@@ -110,6 +110,15 @@ export class OpenViduComponentsPO {
 		await this.waitForElement('#more-options-menu');
 	}
 
+	async disableScreenShare(): Promise<void> {
+		await this.waitForElement('#screenshare-btn');
+		await this.clickOn('#screenshare-btn');
+		await this.browser.sleep(500);
+		await this.waitForElement('#screenshare-menu');
+		await this.clickOn('#disable-screen-button');
+		await this.browser.sleep(1000);
+	}
+
 	async toggleRecordingFromToolbar() {
 		// Open more options menu
 		await this.toggleToolbarMoreOptions();
diff --git a/openvidu-components-angular/e2e/webcomponent-e2e/screensharing.test.ts b/openvidu-components-angular/e2e/webcomponent-e2e/screensharing.test.ts
index ecdc2f1c..be31e97c 100644
--- a/openvidu-components-angular/e2e/webcomponent-e2e/screensharing.test.ts
+++ b/openvidu-components-angular/e2e/webcomponent-e2e/screensharing.test.ts
@@ -38,14 +38,10 @@ describe('Testing screenshare features', () => {
 		await browser.sleep(500);
 		await utils.waitForElement('.OV_big');
 		expect(await utils.getNumberOfElements('video')).equals(2);
-		expect(await utils.getNumberOfElements('.OV_stream.speaking')).equals(1);
 
-		// Clicking to screensharing button
-		await utils.clickOn('#screenshare-btn');
-		await browser.sleep(500);
-		await utils.waitForElement('#screenshare-menu');
-		await utils.clickOn('#disable-screen-button');
-		await browser.sleep(500);
+		// expect(await utils.getNumberOfElements('.OV_stream.speaking')).equals(1);
+
+		await utils.disableScreenShare();
 
 		expect(await utils.getNumberOfElements('video')).equals(1);
 
@@ -56,11 +52,7 @@ describe('Testing screenshare features', () => {
 		await utils.waitForElement('.OV_big');
 		expect(await utils.getNumberOfElements('video')).equals(2);
 
-		await utils.clickOn('#screenshare-btn');
-		await browser.sleep(500);
-		await utils.waitForElement('#screenshare-menu');
-		await utils.clickOn('#disable-screen-button');
-		await browser.sleep(500);
+		await utils.disableScreenShare();
 
 		expect(await utils.getNumberOfElements('video')).equals(1);
 	});
@@ -82,11 +74,7 @@ describe('Testing screenshare features', () => {
 		await utils.waitForElement('.OV_big');
 		expect(await utils.getNumberOfElements('video')).equals(2);
 
-		await utils.clickOn('#screenshare-btn');
-		await browser.sleep(500);
-		await utils.waitForElement('#screenshare-menu');
-		await utils.clickOn('#disable-screen-button');
-		await browser.sleep(500);
+		await utils.disableScreenShare();
 
 		expect(await utils.getNumberOfElements('video')).equals(1);
 	});
@@ -167,10 +155,7 @@ describe('Testing screenshare features', () => {
 		await utils.waitForElement('.OV_big');
 		expect(await utils.getNumberOfElements('.OV_big')).equals(1);
 		// Disable screensharing
-		await utils.clickOn('#screenshare-btn');
-		await utils.waitForElement('#screenshare-menu');
-		await utils.clickOn('#disable-screen-button');
-		await browser.sleep(500);
+		await utils.disableScreenShare();
 		expect(await utils.getNumberOfElements('video')).equals(3);
 		await utils.waitForElement('.OV_big');
 		expect(await utils.getNumberOfElements('.OV_big')).equals(1);