diff --git a/src/sql/workbench/contrib/dashboard/browser/dashboard.component.ts b/src/sql/workbench/contrib/dashboard/browser/dashboard.component.ts
index 4680624abc..25b5ba2d9d 100644
--- a/src/sql/workbench/contrib/dashboard/browser/dashboard.component.ts
+++ b/src/sql/workbench/contrib/dashboard/browser/dashboard.component.ts
@@ -15,6 +15,7 @@ import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/work
 import * as themeColors from 'vs/workbench/common/theme';
 import { IColorTheme } from 'vs/platform/theme/common/themeService';
 import { onUnexpectedError } from 'vs/base/common/errors';
+import { contrastBorder } from 'vs/platform/theme/common/colorRegistry';
 
 export const DASHBOARD_SELECTOR: string = 'dashboard-component';
 
@@ -47,7 +48,8 @@ export class DashboardComponent extends AngularDisposable implements OnInit {
 
 	private updateTheme(theme: IColorTheme): void {
 		const headerEl = <HTMLElement>this.header.nativeElement;
-		headerEl.style.borderBottomColor = theme.getColor(themeColors.SIDE_BAR_BACKGROUND, true).toString();
+		const highContrastBorder = theme.getColor(contrastBorder);
+		headerEl.style.borderBottomColor = highContrastBorder ? highContrastBorder.toString() : theme.getColor(themeColors.SIDE_BAR_BACKGROUND, true).toString();
 		headerEl.style.borderBottomWidth = '1px';
 		headerEl.style.borderBottomStyle = 'solid';
 	}
diff --git a/src/sql/workbench/contrib/dashboard/browser/widgets/properties/propertiesWidget.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/properties/propertiesWidget.component.ts
index 5b6766ffde..2afeb00b2e 100644
--- a/src/sql/workbench/contrib/dashboard/browser/widgets/properties/propertiesWidget.component.ts
+++ b/src/sql/workbench/contrib/dashboard/browser/widgets/properties/propertiesWidget.component.ts
@@ -21,6 +21,7 @@ import { subscriptionToDisposable } from 'sql/base/browser/lifecycle';
 import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { DASHBOARD_BORDER } from 'vs/workbench/common/theme';
 import { IColorTheme } from 'vs/platform/theme/common/themeService';
+import { contrastBorder } from 'vs/platform/theme/common/colorRegistry';
 
 export interface PropertiesConfig {
 	properties: Array<Property>;
@@ -284,7 +285,11 @@ export class PropertiesWidgetComponent extends DashboardWidget implements IDashb
 	}
 
 	private updateTheme(theme: IColorTheme): void {
-		const border = theme.getColor(DASHBOARD_BORDER);
-		this._container.nativeElement.style.borderBottom = '1px solid ' + border.toString();
+		if (theme.getColor(contrastBorder)) {
+			this._container.nativeElement.style.borderBottom = 'none';
+		} else {
+			const border = theme.getColor(DASHBOARD_BORDER);
+			this._container.nativeElement.style.borderBottom = '1px solid ' + border.toString();
+		}
 	}
 }