diff --git a/extensions/big-data-cluster/src/bigDataCluster/dialog/addControllerDialog.ts b/extensions/big-data-cluster/src/bigDataCluster/dialog/addControllerDialog.ts
index 1536afcb92..4c07a04700 100644
--- a/extensions/big-data-cluster/src/bigDataCluster/dialog/addControllerDialog.ts
+++ b/extensions/big-data-cluster/src/bigDataCluster/dialog/addControllerDialog.ts
@@ -157,7 +157,7 @@ export class AddControllerDialog {
 					components: [
 						{
 							component: this.urlInputBox,
-							title: localize('textUrlCapital', "URL"),
+							title: localize('textUrlCapital', "Cluster Management URL"),
 							required: true
 						}, {
 							component: this.authDropdown,
diff --git a/extensions/big-data-cluster/src/bigDataCluster/dialog/hdfsDialogBase.ts b/extensions/big-data-cluster/src/bigDataCluster/dialog/hdfsDialogBase.ts
index 5cd00073c2..f25ba81d3d 100644
--- a/extensions/big-data-cluster/src/bigDataCluster/dialog/hdfsDialogBase.ts
+++ b/extensions/big-data-cluster/src/bigDataCluster/dialog/hdfsDialogBase.ts
@@ -167,7 +167,7 @@ export abstract class HdfsDialogBase<T extends HdfsDialogProperties, R> {
 				components: [
 					{
 						component: this.urlInputBox,
-						title: localize('textUrlCapital', "URL"),
+						title: localize('textUrlCapital', "Cluster Management URL"),
 						required: true
 					}, {
 						component: this.authDropdown,
diff --git a/src/sql/base/browser/ui/selectBox/selectBox.ts b/src/sql/base/browser/ui/selectBox/selectBox.ts
index ca8ca054fd..130aabc9b3 100644
--- a/src/sql/base/browser/ui/selectBox/selectBox.ts
+++ b/src/sql/base/browser/ui/selectBox/selectBox.ts
@@ -105,7 +105,7 @@ export class SelectBox extends vsSelectBox {
 			// SelectBoxList uses its own custom drop down list so we need to also stop propagation from that or it'll
 			// also bubble up
 			this.onkeydown(this.selectBoxDelegate.selectDropDownContainer, (e: IKeyboardEvent) => {
-				if (e.keyCode === KeyCode.Enter) {
+				if (e.keyCode === KeyCode.Enter || e.keyCode === KeyCode.Escape) {
 					dom.EventHelper.stop(e, true);
 				}
 			});
diff --git a/src/sql/workbench/browser/modal/media/modal.css b/src/sql/workbench/browser/modal/media/modal.css
index f9493019ae..379a305170 100644
--- a/src/sql/workbench/browser/modal/media/modal.css
+++ b/src/sql/workbench/browser/modal/media/modal.css
@@ -56,6 +56,8 @@
 .modal .modal-title {
 	font-size: 15px;
 	font-weight: 600;
+	margin-block-start: 0px;
+	margin-block-end: 0px;
 }
 
 .modal .modal-title-icon {
diff --git a/src/sql/workbench/browser/modal/modal.ts b/src/sql/workbench/browser/modal/modal.ts
index bcf57826f7..fcaf2cce11 100644
--- a/src/sql/workbench/browser/modal/modal.ts
+++ b/src/sql/workbench/browser/modal/modal.ts
@@ -188,7 +188,7 @@ export abstract class Modal extends Disposable implements IThemable {
 				this._modalTitleIcon = DOM.append(this._modalHeaderSection, DOM.$('.modal-title-icon'));
 			}
 
-			this._modalTitle = DOM.append(this._modalHeaderSection, DOM.$('.modal-title'));
+			this._modalTitle = DOM.append(this._modalHeaderSection, DOM.$('h1.modal-title'));
 			this._modalTitle.innerText = this._title;
 		}