diff --git a/extensions/agent/src/dialogs/jobDialog.ts b/extensions/agent/src/dialogs/jobDialog.ts
index a0012d25ef..2555c6db0b 100644
--- a/extensions/agent/src/dialogs/jobDialog.ts
+++ b/extensions/agent/src/dialogs/jobDialog.ts
@@ -169,6 +169,9 @@ export class JobDialog extends AgentDialog<JobData>  {
 			this.nameTextBox.onTextChanged(() => {
 				if (this.nameTextBox.value && this.nameTextBox.value.length > 0) {
 					this.dialog.message = null;
+					// Change the job name immediately since steps
+					// depends on the job name
+					this.model.name = this.nameTextBox.value;
 				}
 			});
 			this.ownerTextBox = view.modelBuilder.inputBox().component();
diff --git a/src/sql/workbench/parts/jobManagement/electron-browser/jobStepsView.component.html b/src/sql/workbench/parts/jobManagement/electron-browser/jobStepsView.component.html
index bf420227e6..0321401103 100644
--- a/src/sql/workbench/parts/jobManagement/electron-browser/jobStepsView.component.html
+++ b/src/sql/workbench/parts/jobManagement/electron-browser/jobStepsView.component.html
@@ -6,7 +6,7 @@
 -->
 
 <div class="steps-header">
-	<div class="steps-icon"></div>
+	<div class="steps-icon" title="Steps"></div>
 	<h1 style="display: inline">Steps</h1>
 </div>
 <div class='steps-tree' style="flex: 1 1 auto; position: relative">