diff --git a/test/automation/src/settings.ts b/test/automation/src/settings.ts
index f61ff0dc36c..2ade8b4a9af 100644
--- a/test/automation/src/settings.ts
+++ b/test/automation/src/settings.ts
@@ -25,8 +25,7 @@ export class SettingsEditor {
 		await this.openUserSettingsFile();
 
 		await this.code.dispatchKeybinding('right');
-		const selectionOffset = this._editContextSelectionOffset();
-		await this.editor.waitForEditorSelection('settings.json', s => s.selectionStart === selectionOffset && s.selectionEnd === selectionOffset);
+		await this.editor.waitForEditorSelection('settings.json', (s) => this._acceptEditorSelection(this.code.quality, s));
 		await this.editor.waitForTypeInEditor('settings.json', `"${setting}": ${value},`);
 		await this.editors.saveOpenedFile();
 	}
@@ -41,8 +40,7 @@ export class SettingsEditor {
 		await this.openUserSettingsFile();
 
 		await this.code.dispatchKeybinding('right');
-		const selectionOffset = this._editContextSelectionOffset();
-		await this.editor.waitForEditorSelection('settings.json', (s) => s.selectionStart === selectionOffset && s.selectionEnd === selectionOffset);
+		await this.editor.waitForEditorSelection('settings.json', (s) => this._acceptEditorSelection(this.code.quality, s));
 		await this.editor.waitForTypeInEditor('settings.json', settings.map(v => `"${v[0]}": ${v[1]},`).join(''));
 		await this.editors.saveOpenedFile();
 	}
@@ -86,7 +84,10 @@ export class SettingsEditor {
 		return this.code.quality === Quality.Stable ? SEARCH_BOX_TEXTAREA : SEARCH_BOX_NATIVE_EDIT_CONTEXT;
 	}
 
-	private _editContextSelectionOffset(): number {
-		return this.code.quality === Quality.Stable ? 0 : 1;
+	private _acceptEditorSelection(quality: Quality, s: { selectionStart: number; selectionEnd: number }): boolean {
+		if (quality === Quality.Stable) {
+			return true;
+		}
+		return s.selectionStart === 1 && s.selectionEnd === 1;
 	}
 }