diff --git a/src/sql/workbench/parts/connection/electron-browser/connectionViewlet.ts b/src/sql/workbench/parts/connection/electron-browser/connectionViewlet.ts
index 045a0f3923..6d9852db62 100644
--- a/src/sql/workbench/parts/connection/electron-browser/connectionViewlet.ts
+++ b/src/sql/workbench/parts/connection/electron-browser/connectionViewlet.ts
@@ -107,7 +107,7 @@ export class ConnectionViewlet extends Viewlet implements IConnectionsViewlet {
 	}
 
 	public layout({ height, width }: DOM.Dimension): void {
-		this._serverTreeView.layout(height - 36); // account for search box
+		this._serverTreeView.layout(height);
 		DOM.toggleClass(this._root, 'narrow', width <= 350);
 	}
 
diff --git a/src/sql/workbench/parts/connection/electron-browser/media/connectionViewlet.css b/src/sql/workbench/parts/connection/electron-browser/media/connectionViewlet.css
index bdf8f0b80a..49e7b4edf7 100644
--- a/src/sql/workbench/parts/connection/electron-browser/media/connectionViewlet.css
+++ b/src/sql/workbench/parts/connection/electron-browser/media/connectionViewlet.css
@@ -29,7 +29,7 @@
 }
 
 .server-explorer-viewlet .object-explorer-view {
-	height: calc(100% - 36px);
+	height: 100%;
 }
 
 .server-explorer-viewlet .server-group {
diff --git a/src/sql/workbench/parts/dataExplorer/browser/connectionViewletPanel.ts b/src/sql/workbench/parts/dataExplorer/browser/connectionViewletPanel.ts
index 97b2430927..ea33832ccc 100644
--- a/src/sql/workbench/parts/dataExplorer/browser/connectionViewletPanel.ts
+++ b/src/sql/workbench/parts/dataExplorer/browser/connectionViewletPanel.ts
@@ -83,7 +83,7 @@ export class ConnectionViewletPanel extends ViewletPanel {
 	}
 
 	layoutBody(size: number): void {
-		this._serverTreeView.layout(size - 46); // account for search box and horizontal scroll bar
+		this._serverTreeView.layout(size);
 		DOM.toggleClass(this._root, 'narrow', this._root.clientWidth < 300);
 	}