diff --git a/src/vs/workbench/api/node/extHostTreeViews.ts b/src/vs/workbench/api/node/extHostTreeViews.ts
index 487b76fa9a7..e6d4ee22a8a 100644
--- a/src/vs/workbench/api/node/extHostTreeViews.ts
+++ b/src/vs/workbench/api/node/extHostTreeViews.ts
@@ -264,6 +264,10 @@ class ExtHostTreeView<T> extends Disposable {
 	}
 
 	private resolveTreeNode(element: T, parent?: TreeNode): Thenable<TreeNode> {
+		const node = this.nodes.get(element);
+		if (node) {
+			return Promise.resolve(node);
+		}
 		return asThenable(() => this.dataProvider.getTreeItem(element))
 			.then(extTreeItem => this.createHandle(element, extTreeItem, parent, true))
 			.then(handle => this.getChildren(parent ? parent.item.handle : null)