diff --git a/extensions/mssql/src/main.ts b/extensions/mssql/src/main.ts
index e8f4b13900..ee04d9192d 100644
--- a/extensions/mssql/src/main.ts
+++ b/extensions/mssql/src/main.ts
@@ -180,7 +180,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<MssqlE
 
 				container.addItem(endPointRow, { CSSStyles: { 'padding-left': '10px', 'border-top': 'solid 1px #ccc', 'box-sizing': 'border-box', 'user-select': 'text' } });
 			});
-			const endpointsContainer = view.modelBuilder.flexContainer().withLayout({ flexFlow: 'column', width: '540px', height: '100%', alignItems: 'left' }).component();
+			const endpointsContainer = view.modelBuilder.flexContainer().withLayout({ flexFlow: 'column', width: '540px', height: '100%', alignItems: 'left', position: 'absolute' }).component();
 			endpointsContainer.addItem(container, { CSSStyles: { 'padding-top': '25px', 'padding-left': '5px' } });
 
 			await view.initializeModel(endpointsContainer);
diff --git a/src/sql/workbench/parts/dashboard/containers/dashboardGridContainer.component.html b/src/sql/workbench/parts/dashboard/containers/dashboardGridContainer.component.html
index 5e4ce3cb68..6240b6773d 100644
--- a/src/sql/workbench/parts/dashboard/containers/dashboardGridContainer.component.html
+++ b/src/sql/workbench/parts/dashboard/containers/dashboardGridContainer.component.html
@@ -4,7 +4,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 -->
-<div>
+<div class="fullsize" style="display: flex; flex-direction: column">
+	<div scrollable [horizontalScroll]="ScrollbarVisibility.Auto" [verticalScroll]="ScrollbarVisibility.Auto">
 	<table class="grid-table">
 		<tr *ngFor="let row of rows" class="grid-table-row">
 			<ng-container *ngFor="let col of cols">
@@ -28,4 +29,5 @@
 			</ng-container>
 		</tr>
 	</table>
+	</div>
 </div>
\ No newline at end of file
diff --git a/src/sql/workbench/parts/dashboard/containers/dashboardGridContainer.component.ts b/src/sql/workbench/parts/dashboard/containers/dashboardGridContainer.component.ts
index 8603bf57ba..4dfbdb09c4 100644
--- a/src/sql/workbench/parts/dashboard/containers/dashboardGridContainer.component.ts
+++ b/src/sql/workbench/parts/dashboard/containers/dashboardGridContainer.component.ts
@@ -5,7 +5,7 @@
 
 import 'vs/css!./dashboardGridContainer';
 
-import { Component, Inject, Input, forwardRef, ElementRef, ViewChildren, QueryList, OnDestroy, ChangeDetectorRef } from '@angular/core';
+import { Component, Inject, Input, forwardRef, ElementRef, ViewChildren, QueryList, OnDestroy, ChangeDetectorRef, ContentChild } from '@angular/core';
 
 import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
 import { TabConfig, WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget';
@@ -15,6 +15,8 @@ import { WebviewContent } from 'sql/workbench/parts/dashboard/contents/webviewCo
 import { TabChild } from 'sql/base/electron-browser/ui/panel/tab.component';
 
 import { Event, Emitter } from 'vs/base/common/event';
+import { ScrollableDirective } from 'sql/base/electron-browser/ui/scrollable/scrollable.directive';
+import { ScrollbarVisibility } from 'vs/editor/common/standalone/standaloneEnums';
 
 export interface GridCellConfig {
 	id?: string;
@@ -52,6 +54,7 @@ export class DashboardGridContainer extends DashboardTab implements OnDestroy {
 	public readonly onResize: Event<void> = this._onResize.event;
 	private cellWidth: number = 270;
 	private cellHeight: number = 270;
+	private ScrollbarVisibility = ScrollbarVisibility;
 
 	protected SKELETON_WIDTH = 5;
 
@@ -175,6 +178,7 @@ export class DashboardGridContainer extends DashboardTab implements OnDestroy {
 
 	@ViewChildren(DashboardWidgetWrapper) private _widgets: QueryList<DashboardWidgetWrapper>;
 	@ViewChildren(WebviewContent) private _webViews: QueryList<WebviewContent>;
+	@ContentChild(ScrollableDirective) private _scrollable;
 	constructor(
 		@Inject(forwardRef(() => CommonServiceInterface)) protected dashboardService: CommonServiceInterface,
 		@Inject(forwardRef(() => ElementRef)) protected _el: ElementRef,
@@ -236,6 +240,9 @@ export class DashboardGridContainer extends DashboardTab implements OnDestroy {
 				item.layout();
 			});
 		}
+		if (this._scrollable) {
+			this._scrollable.layout();
+		}
 	}
 
 	public refresh(): void {