diff --git a/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts b/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
index 3e0bb79f09639b886218e3b73919bbcaec828343..1d24f2d8eea76232dccfbcb1adc89e8e114d3e9e 100644
--- a/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
+++ b/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
@@ -565,6 +565,10 @@ export class SettingsEditor2 extends BaseEditor {
 
 		resolvedSettingsRoot.children.push(resolveExtensionsSettings(dividedGroups.extension || []));
 
+		if (this.searchResultModel) {
+			this.searchResultModel.updateChildren();
+		}
+
 		if (this.settingsTreeModel) {
 			this.settingsTreeModel.update(resolvedSettingsRoot);
 		} else {
diff --git a/src/vs/workbench/parts/preferences/browser/settingsTree.ts b/src/vs/workbench/parts/preferences/browser/settingsTree.ts
index eb577526abcf1943e0a0e611eef2f9756815211b..429b2628bc9cd97bb57207723c2c326dfed81152 100644
--- a/src/vs/workbench/parts/preferences/browser/settingsTree.ts
+++ b/src/vs/workbench/parts/preferences/browser/settingsTree.ts
@@ -907,10 +907,12 @@ export class SearchResultModel {
 		}
 
 		this.rawSearchResults[type] = result;
+		this.updateChildren();
+	}
 
-		// Recompute children
+	updateChildren(): void {
 		this.children = this.getFlatSettings()
-			.map(s => createSettingsTreeSettingElement(s, result, this._viewState.settingsTarget, this._configurationService));
+			.map(s => createSettingsTreeSettingElement(s, this, this._viewState.settingsTarget, this._configurationService));
 	}
 
 	private getFlatSettings(): ISetting[] {