diff --git a/src/vs/workbench/parts/preferences/browser/preferencesService.ts b/src/vs/workbench/parts/preferences/browser/preferencesService.ts index c553d684820f392b67607e8f05ce7d84c8703f57..45a4cff98095d843946fdd1fbc84dc66d726e791 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesService.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesService.ts @@ -197,8 +197,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic switchSettings(target: ConfigurationTarget, resource: URI): TPromise { const activeEditor = this.editorService.getActiveEditor(); - const activeEditorInput = activeEditor.input; - if (activeEditorInput instanceof PreferencesEditorInput) { + if (activeEditor && activeEditor.input instanceof PreferencesEditorInput) { return this.getOrCreateEditableSettingsEditorInput(target, this.getEditableSettingsURI(target, resource)) .then(toInput => { const replaceWith = new PreferencesEditorInput(this.getPreferencesEditorInputName(target, resource), toInput.getDescription(), this.instantiationService.createInstance(DefaultPreferencesEditorInput, this.getDefaultSettingsResource(target)), toInput);