diff --git a/samples/sqlservices/src/controllers/treeDataProvider.ts b/samples/sqlservices/src/controllers/treeDataProvider.ts
index c19ae677da..454eb96f96 100644
--- a/samples/sqlservices/src/controllers/treeDataProvider.ts
+++ b/samples/sqlservices/src/controllers/treeDataProvider.ts
@@ -77,7 +77,7 @@ export class TreeNode implements sqlops.TreeComponentItem {
 
 	public get collapsibleState(): vscode.TreeItemCollapsibleState {
 		if (!this._isAlwaysLeaf) {
-			return vscode.TreeItemCollapsibleState.Collapsed;
+			return vscode.TreeItemCollapsibleState.Expanded;
 		} else {
 			vscode.TreeItemCollapsibleState.None;
 		}
diff --git a/src/sql/parts/modelComponents/tree/treeDataSource.ts b/src/sql/parts/modelComponents/tree/treeDataSource.ts
index be1eec6f9f..34373bf5c4 100644
--- a/src/sql/parts/modelComponents/tree/treeDataSource.ts
+++ b/src/sql/parts/modelComponents/tree/treeDataSource.ts
@@ -55,4 +55,8 @@ export class TreeComponentDataSource implements IDataSource {
 	public getParent(tree: ITree, node: any): TPromise<any> {
 		return TPromise.as(null);
 	}
+
+	public shouldAutoexpand(tree: ITree, node: ITreeComponentItem): boolean {
+		return node.collapsibleState === TreeItemCollapsibleState.Expanded;
+	}
 }
\ No newline at end of file