diff --git a/src/sql/parts/jobManagement/views/jobHistory.component.html b/src/sql/parts/jobManagement/views/jobHistory.component.html
index f007d00d5b..940da572c4 100644
--- a/src/sql/parts/jobManagement/views/jobHistory.component.html
+++ b/src/sql/parts/jobManagement/views/jobHistory.component.html
@@ -19,7 +19,7 @@
 
 <!-- Overview  -->
  <div class="overview-container">
-   <div class="overview-tab" (click)='toggleCollapse()'>
+   <div class="overview-tab" (click)='toggleCollapse()' tabindex="0">
 	 <input id="accordion" type="checkbox">
 	 <label for="accordion">
 		<div class="resultsViewCollapsible collapsed" (click)='toggleCollapse()'></div>
diff --git a/src/sql/parts/jobManagement/views/jobHistory.component.ts b/src/sql/parts/jobManagement/views/jobHistory.component.ts
index eaa35f99ca..651908a4b0 100644
--- a/src/sql/parts/jobManagement/views/jobHistory.component.ts
+++ b/src/sql/parts/jobManagement/views/jobHistory.component.ts
@@ -148,6 +148,8 @@ export class JobHistoryComponent extends Disposable implements OnInit {
 				if (this._jobCacheObject.prevJobID === this._agentViewComponent.jobId || jobHistories[0].jobId === this._agentViewComponent.jobId) {
 					this._showPreviousRuns = true;
 					this.buildHistoryTree(self, jobHistories);
+					$('jobhistory-component .history-details .prev-run-list .monaco-tree').attr('tabIndex', '-1');
+					$('jobhistory-component .history-details .prev-run-list .monaco-tree-row').attr('tabIndex', '0');
 					this._cd.detectChanges();
 				}
 			} else if (jobHistories && jobHistories.length === 0 ){
diff --git a/src/sql/parts/jobManagement/views/jobStepsView.component.ts b/src/sql/parts/jobManagement/views/jobStepsView.component.ts
index c2e21f2d2d..7f0eee9632 100644
--- a/src/sql/parts/jobManagement/views/jobStepsView.component.ts
+++ b/src/sql/parts/jobManagement/views/jobStepsView.component.ts
@@ -60,11 +60,13 @@ export class JobStepsViewComponent extends Disposable implements OnInit, AfterCo
 					dataSource: this._treeDataSource,
 					filter: this._treeFilter,
 					renderer: this._treeRenderer
-				}, {verticalScrollMode: ScrollbarVisibility.Visible});
+				}, { verticalScrollMode: ScrollbarVisibility.Visible });
 				this._register(attachListStyler(this._tree, this.bootstrapService.themeService));
 			}
 			this._tree.layout(JobStepsViewComponent._pageSize);
 			this._tree.setInput(new JobStepsViewModel());
+			$('jobstepsview-component .steps-tree .monaco-tree').attr('tabIndex', '-1');
+			$('jobstepsview-component .steps-tree .monaco-tree-row').attr('tabIndex', '0');
 		}
 	}