diff --git a/app/scripts/modules/core/src/task/monitor/TaskMonitor.ts b/app/scripts/modules/core/src/task/monitor/TaskMonitor.ts
index a04b0fb6d18..ce8207dc74e 100644
--- a/app/scripts/modules/core/src/task/monitor/TaskMonitor.ts
+++ b/app/scripts/modules/core/src/task/monitor/TaskMonitor.ts
@@ -80,6 +80,7 @@ export class TaskMonitor {
     this.task = null;
     this.error = false;
     this.errorMessage = null;
+    document.activeElement && (document.activeElement as HTMLElement).blur();
   }
 
   public setError(task?: ITask): void {
diff --git a/app/scripts/modules/core/src/task/monitor/taskMonitor.html b/app/scripts/modules/core/src/task/monitor/taskMonitor.html
index dc338c131f8..508afbc8198 100644
--- a/app/scripts/modules/core/src/task/monitor/taskMonitor.html
+++ b/app/scripts/modules/core/src/task/monitor/taskMonitor.html
@@ -11,7 +11,7 @@ <h3>{{taskMonitor.title}}</h3>
     </div>
   </div>
   <div class="modal-footer" ng-if="!taskMonitor.error">
-    <button class="btn btn-primary" ng-click="taskMonitor.closeModal()" autofocus>Close</button>
+    <button class="btn btn-primary" ng-click="taskMonitor.closeModal()">Close</button>
   </div>
   <div class="modal-footer" ng-if="taskMonitor.error">
     <button class="btn btn-primary" ng-click="taskMonitor.tryToFix()">Go back and try to fix this</button>