diff --git a/src/sql/parts/dataExplorer/objectExplorer/connectionViewlet/connectionViewletPanel.ts b/src/sql/parts/dataExplorer/objectExplorer/connectionViewlet/connectionViewletPanel.ts
index 842dbd23f7..abb150b778 100644
--- a/src/sql/parts/dataExplorer/objectExplorer/connectionViewlet/connectionViewletPanel.ts
+++ b/src/sql/parts/dataExplorer/objectExplorer/connectionViewlet/connectionViewletPanel.ts
@@ -111,7 +111,7 @@ export class ConnectionViewletPanel extends ViewletPanel {
 
 	layoutBody(size: number): void {
 		this._searchBox.layout();
-		this._serverTreeView.layout(size); // account for search box
+		this._serverTreeView.layout(size - 46); // account for search box and horizontal scroll bar
 		DOM.toggleClass(this._root, 'narrow', this._root.clientWidth < 300);
 	}
 
diff --git a/src/sql/parts/objectExplorer/viewlet/treeCreationUtils.ts b/src/sql/parts/objectExplorer/viewlet/treeCreationUtils.ts
index e10c2f4f78..615d1f5204 100644
--- a/src/sql/parts/objectExplorer/viewlet/treeCreationUtils.ts
+++ b/src/sql/parts/objectExplorer/viewlet/treeCreationUtils.ts
@@ -15,6 +15,7 @@ import { DefaultFilter, DefaultAccessibilityProvider, DefaultController } from '
 import { IController } from 'vs/base/parts/tree/browser/tree';
 import { ServerTreeDragAndDrop, RecentConnectionsDragAndDrop } from 'sql/parts/objectExplorer/viewlet/dragAndDropController';
 import { RecentConnectionDataSource } from 'sql/parts/objectExplorer/viewlet/recentConnectionDataSource';
+import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 
 export class TreeCreationUtils {
 	/**