diff --git a/src/sql/base/browser/ui/panel/panel.component.ts b/src/sql/base/browser/ui/panel/panel.component.ts
index 5fc2b49b1e..6c679c7279 100644
--- a/src/sql/base/browser/ui/panel/panel.component.ts
+++ b/src/sql/base/browser/ui/panel/panel.component.ts
@@ -53,7 +53,7 @@ let idPool = 0;
 	selector: 'panel',
 	template: `
 		<div #rootContainer class="tabbedPanel fullsize" [ngClass]="_options.layout === NavigationBarLayout.vertical ? 'vertical' : 'horizontal'">
-			<div *ngIf="!_options.alwaysShowTabs ? _tabs.length !== 1 : true" class="composite title">
+			<div *ngIf="!_options.alwaysShowTabs ? _tabs && _tabs.length !== 1 : true" class="composite title">
 				<div class="tabContainer">
 					<div *ngIf="_options.layout === NavigationBarLayout.vertical" class="vertical-tab-action-container">
 						<button [attr.aria-expanded]="_tabExpanded" [title]="toggleTabPanelButtonAriaLabel" [attr.aria-label]="toggleTabPanelButtonAriaLabel" [ngClass]="toggleTabPanelButtonCssClass" tabindex="0" (click)="toggleTabPanel()"></button>
diff --git a/src/sql/workbench/contrib/dashboard/browser/containers/dashboardNavSection.component.ts b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardNavSection.component.ts
index e6a0656960..517e97c493 100644
--- a/src/sql/workbench/contrib/dashboard/browser/containers/dashboardNavSection.component.ts
+++ b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardNavSection.component.ts
@@ -149,10 +149,12 @@ export class DashboardNavSection extends DashboardTab implements OnDestroy, OnCh
 	}
 
 	public layout() {
-		const activeTabId = this._panel.getActiveTab;
-		const localtab = this._tabs.find(i => i.id === activeTabId);
-		this._cd.detectChanges();
-		localtab.layout();
+		if (this._tabs) {
+			const activeTabId = this._panel.getActiveTab;
+			const localtab = this._tabs.find(i => i.id === activeTabId);
+			this._cd.detectChanges();
+			localtab.layout();
+		}
 	}
 
 	public refresh(): void {