diff --git a/src/vs/workbench/api/node/extHostTreeViews.ts b/src/vs/workbench/api/node/extHostTreeViews.ts
index bbfde013dddf34b07d9b4f076d3dfaef8ea2e043..9a27a7fa3a7b74fec6c4b093cbec35a0ecb8bf82 100644
--- a/src/vs/workbench/api/node/extHostTreeViews.ts
+++ b/src/vs/workbench/api/node/extHostTreeViews.ts
@@ -86,7 +86,9 @@ class ExtHostTreeView<T> extends Disposable {
 	constructor(private viewId: string, private dataProvider: vscode.TreeDataProvider<T>, private proxy: MainThreadTreeViewsShape) {
 		super();
 		this.proxy.$registerView(viewId);
-		this._register(dataProvider.onDidChange(element => this._refresh(element)));
+		if (dataProvider.onDidChange) {
+			this._register(dataProvider.onDidChange(element => this._refresh(element)));
+		}
 	}
 
 	getTreeItems(): TPromise<TreeItem[]> {
diff --git a/src/vs/workbench/parts/views/browser/treeView.ts b/src/vs/workbench/parts/views/browser/treeView.ts
index fc0e34b8a62392ff312577dce41d572eac1cce8e..d80990bbe72c6af8316c66f5acd160ea25d2584c 100644
--- a/src/vs/workbench/parts/views/browser/treeView.ts
+++ b/src/vs/workbench/parts/views/browser/treeView.ts
@@ -388,7 +388,7 @@ class Menus implements IDisposable {
 		}
 
 		const _contextKeyService = this.contextKeyService.createScoped();
-		contextKeyService.createKey('view', id);
+		_contextKeyService.createKey('view', id);
 
 		const titleMenu = this.menuService.createMenu(MenuId.ViewTitle, _contextKeyService);
 		const updateActions = () => {