diff --git a/src/sql/parts/dashboard/dashboardInput.ts b/src/sql/parts/dashboard/dashboardInput.ts
index f3bd15f355..22dd0e8205 100644
--- a/src/sql/parts/dashboard/dashboardInput.ts
+++ b/src/sql/parts/dashboard/dashboardInput.ts
@@ -84,7 +84,7 @@ export class DashboardInput extends EditorInput {
 			return '';
 		}
 
-		let name = this.connectionProfile.serverName;
+		let name = this.connectionProfile.connectionName ? this.connectionProfile.connectionName : this.connectionProfile.serverName;
 		if (this.connectionProfile.databaseName
 			&& !this.isMasterMssql()) {
 			// Only add DB name if this is a non-default, non-master connection
diff --git a/src/sql/parts/dashboard/services/breadcrumb.service.ts b/src/sql/parts/dashboard/services/breadcrumb.service.ts
index 8d4e0c5bab..97de0ddb95 100644
--- a/src/sql/parts/dashboard/services/breadcrumb.service.ts
+++ b/src/sql/parts/dashboard/services/breadcrumb.service.ts
@@ -60,7 +60,7 @@ export class BreadcrumbService implements IBreadcrumbService {
 	}
 
 	private getServerBreadcrumb(profile: ConnectionProfile): MenuItem {
-		return { label: profile.serverName, routerLink: ['server-dashboard'] };
+		return profile.connectionName ? { label: profile.connectionName, routerLink: ['server-dashboard'] } : { label: profile.serverName, routerLink: ['server-dashboard'] };
 	}
 
 	private getDbBreadcrumb(profile: ConnectionProfile): MenuItem {