diff --git a/samples/sqlservices/src/controllers/treeDataProvider.ts b/samples/sqlservices/src/controllers/treeDataProvider.ts
index 253d85dd55..c19ae677da 100644
--- a/samples/sqlservices/src/controllers/treeDataProvider.ts
+++ b/samples/sqlservices/src/controllers/treeDataProvider.ts
@@ -75,6 +75,14 @@ export class TreeNode implements sqlops.TreeComponentItem {
 		this.data.label = value;
 	}
 
+	public get collapsibleState(): vscode.TreeItemCollapsibleState {
+		if (!this._isAlwaysLeaf) {
+			return vscode.TreeItemCollapsibleState.Collapsed;
+		} else {
+			vscode.TreeItemCollapsibleState.None;
+		}
+	}
+
 	public get label(): string {
 		return this.data.label;
 	}
@@ -265,6 +273,7 @@ export class TreeDataProvider implements sqlops.TreeComponentDataProvider<TreeNo
 			let item: sqlops.TreeComponentItem = {};
 			item.label = element.label;
 			item.checked = element.checked;
+			item.collapsibleState = element.collapsibleState;
 			item.iconPath = vscode.Uri.file(path.join(__dirname, '..', 'media', 'monitor.svg'));
 			return item;
 		}
diff --git a/src/sql/parts/modelComponents/tree/tree.component.ts b/src/sql/parts/modelComponents/tree/tree.component.ts
index 8f461d4195..d4f104723e 100644
--- a/src/sql/parts/modelComponents/tree/tree.component.ts
+++ b/src/sql/parts/modelComponents/tree/tree.component.ts
@@ -31,7 +31,7 @@ class Root implements ITreeComponentItem {
 	label = 'root';
 	handle = '0';
 	parentHandle = null;
-	collapsibleState = 0;
+	collapsibleState = 2;
 	children = void 0;
 	options = undefined;
 }
diff --git a/src/sql/parts/modelComponents/tree/treeDataSource.ts b/src/sql/parts/modelComponents/tree/treeDataSource.ts
index f338616b41..be1eec6f9f 100644
--- a/src/sql/parts/modelComponents/tree/treeDataSource.ts
+++ b/src/sql/parts/modelComponents/tree/treeDataSource.ts
@@ -8,6 +8,7 @@
 import { ITree, IDataSource } from 'vs/base/parts/tree/browser/tree';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IModelViewTreeViewDataProvider, ITreeComponentItem } from 'sql/workbench/common/views';
+import { TreeItemCollapsibleState } from 'vs/workbench/common/views';
 
 /**
  * Implements the DataSource(that returns a parent/children of an element) for the recent connection tree
@@ -34,7 +35,7 @@ export class TreeComponentDataSource implements IDataSource {
 	 * Returns a boolean value indicating whether the element has children.
 	 */
 	public hasChildren(tree: ITree, node: ITreeComponentItem): boolean {
-		return this._dataProvider !== undefined;
+		return this._dataProvider !== undefined && node.collapsibleState !== TreeItemCollapsibleState.None;
 	}
 
 	/**