diff --git a/src/sql/parts/dashboard/common/dashboardWidgetWrapper.component.ts b/src/sql/parts/dashboard/common/dashboardWidgetWrapper.component.ts
index 1a03581774..12b444df3c 100644
--- a/src/sql/parts/dashboard/common/dashboardWidgetWrapper.component.ts
+++ b/src/sql/parts/dashboard/common/dashboardWidgetWrapper.component.ts
@@ -77,6 +77,7 @@ export class DashboardWidgetWrapper implements AfterContentInit, OnInit, OnDestr
 		if (this._actions) {
 			this._actionbar.push(this._bootstrap.instantiationService.createInstance(ToggleMoreWidgetAction, this._actions, this._component.actionsContext), { icon: true, label: false });
 		}
+		this.layout();
 	}
 
 	ngOnDestroy() {
diff --git a/src/sql/parts/dashboard/widgets/explorer/explorerWidget.component.ts b/src/sql/parts/dashboard/widgets/explorer/explorerWidget.component.ts
index 0fd65dd852..88d619edb9 100644
--- a/src/sql/parts/dashboard/widgets/explorer/explorerWidget.component.ts
+++ b/src/sql/parts/dashboard/widgets/explorer/explorerWidget.component.ts
@@ -118,4 +118,8 @@ export class ExplorerWidget extends DashboardWidget implements IDashboardWidget,
 	public refresh(): void {
 		this.init();
 	}
+
+	public layout(): void {
+		this._tree.layout(getContentHeight(this._tableContainer.nativeElement));
+	}
 }