Limit scope when SettingTree focus context is applied

roblourens · roblourens · commit bfff8243c50f · 2020-09-29T21:54:34.000-07:00
Fix microsoft#107745
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts b/src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
@@ -686,8 +686,10 @@ export class SettingsEditor2 extends EditorPane {
 		}));
 
 		this._register(this.settingsTree.onDidFocus(() => {
-			this._currentFocusContext = SettingsFocusContext.SettingTree;
-			this.settingRowFocused.set(true);
+			if (document.activeElement?.classList.contains('monaco-list')) {
+				this._currentFocusContext = SettingsFocusContext.SettingTree;
+				this.settingRowFocused.set(true);
+			}
 		}));
 
 		this._register(this.settingsTree.onDidBlur(() => {
