diff --git a/tests/e2e/pageobjects/ide/RestrictedModeButton.ts b/tests/e2e/pageobjects/ide/RestrictedModeButton.ts
index 02ef486f010..4e1c57f79a9 100644
--- a/tests/e2e/pageobjects/ide/RestrictedModeButton.ts
+++ b/tests/e2e/pageobjects/ide/RestrictedModeButton.ts
@@ -17,6 +17,7 @@ import { Logger } from '../../utils/Logger';
 @injectable()
 export class RestrictedModeButton {
 	private static readonly RESTRICTED_MODE_BUTTON: By = By.id('status.workspaceTrust');
+	private static readonly CLOSE_RESTRICTED_MODE_WINDOW: By = By.css('a[aria-label="Close Modal Editor (Escape)"]');
 
 	constructor(
 		@inject(CLASSES.DriverHelper)
@@ -29,6 +30,12 @@ export class RestrictedModeButton {
 		await this.driverHelper.waitAndClick(RestrictedModeButton.RESTRICTED_MODE_BUTTON);
 	}
 
+	async closeRestrictedModeWindow(): Promise<void> {
+		Logger.debug();
+
+		await this.driverHelper.waitAndClick(RestrictedModeButton.CLOSE_RESTRICTED_MODE_WINDOW);
+	}
+
 	async isRestrictedModeButtonDisappearance(): Promise<void> {
 		Logger.debug();
 
diff --git a/tests/e2e/specs/factory/SshUrlNoOauthPatFactory.spec.ts b/tests/e2e/specs/factory/SshUrlNoOauthPatFactory.spec.ts
index 041c2acbb90..6d6f3b9146a 100644
--- a/tests/e2e/specs/factory/SshUrlNoOauthPatFactory.spec.ts
+++ b/tests/e2e/specs/factory/SshUrlNoOauthPatFactory.spec.ts
@@ -57,7 +57,7 @@ suite(`The SshUrlNoOauthPatFactory userstory ${BASE_TEST_CONSTANTS.TEST_ENVIRONM
 	let scmContextMenu: ContextMenu;
 	let viewsActionsButton: boolean;
 	// test specific data
-	const timeToRefresh: number = 1500;
+	const timeToRefresh: number = 2500;
 	const changesToCommit: string = 'Commit ' + new Date().getTime().toString();
 	const fileToChange: string = 'Date.txt';
 	const refreshButtonLabel: string = 'Refresh';
@@ -139,6 +139,7 @@ suite(`The SshUrlNoOauthPatFactory userstory ${BASE_TEST_CONSTANTS.TEST_ENVIRONM
 			await driverHelper.getDriver().actions().sendKeys(Key.DELETE).perform();
 			await driverHelper.wait(1000);
 			Logger.debug(`Entering text: "${changesToCommit}"`);
+			await driverHelper.wait(2000);
 			await driverHelper.getDriver().actions().sendKeys(changesToCommit).perform();
 		});
 
diff --git a/tests/e2e/tests-library/ProjectAndFileTests.ts b/tests/e2e/tests-library/ProjectAndFileTests.ts
index b30fc3db9c0..ccebfe8e7a5 100644
--- a/tests/e2e/tests-library/ProjectAndFileTests.ts
+++ b/tests/e2e/tests-library/ProjectAndFileTests.ts
@@ -92,6 +92,7 @@ export class ProjectAndFileTests {
 					(this.cheCodeLocatorLoader.webCheCodeLocators.Workbench as any).workspaceTrustButton,
 					TIMEOUT_CONSTANTS.TS_DIALOG_WINDOW_DEFAULT_TIMEOUT
 				);
+				await this.restrictedModeButton.closeRestrictedModeWindow();
 			} catch (e) {
 				Logger.info('Restricted Mode button or Trusted Workspace box was not shown');
 			}