diff --git a/test/smoke/src/areas/preferences/keybindings.ts b/test/smoke/src/areas/preferences/keybindings.ts
index 5807b930db3746a59adda90244428f0f139f133b..235621574f0954d88cd22b8d1542f0d9178da69c 100644
--- a/test/smoke/src/areas/preferences/keybindings.ts
+++ b/test/smoke/src/areas/preferences/keybindings.ts
@@ -25,7 +25,7 @@ export class KeybindingsEditor {
 		await this.code.waitForElement('div[aria-label="Keybindings"] .monaco-list-row.keybinding-item.focused.selected');
 
 		await this.code.waitAndClick('div[aria-label="Keybindings"] .monaco-list-row.keybinding-item .action-item .icon.add');
-		await this.code.waitForElement('.defineKeybindingWidget .monaco-inputbox.synthetic-focus');
+		await this.code.waitForActiveElement('.defineKeybindingWidget .monaco-inputbox input');
 
 		await this.code.dispatchKeybinding(keybinding);
 		await this.code.dispatchKeybinding('enter');
diff --git a/test/smoke/src/areas/search/search.ts b/test/smoke/src/areas/search/search.ts
index f5cda6b2af1cf53c6d451250cc8458bb5843ed57..b27d48f4b9e0b8fe1462de8fe2072cdbc6a9a2e3 100644
--- a/test/smoke/src/areas/search/search.ts
+++ b/test/smoke/src/areas/search/search.ts
@@ -68,9 +68,7 @@ export class Search extends Viewlet {
 	}
 
 	async setReplaceText(text: string): Promise<void> {
-		await this.code.waitAndClick(`${VIEWLET} .search-widget .replace-container .monaco-inputbox input[title="Replace"]`);
-		await this.code.waitForElement(`${VIEWLET} .search-widget .replace-container .monaco-inputbox.synthetic-focus input[title="Replace"]`);
-		await this.code.waitForSetValue(`${VIEWLET} .search-widget .replace-container .monaco-inputbox.synthetic-focus input[title="Replace"]`, text);
+		await this.code.waitForSetValue(`${VIEWLET} .search-widget .replace-container .monaco-inputbox input[title="Replace"]`, text);
 	}
 
 	async replaceFileMatch(index: number): Promise<void> {