fixes microsoft#37432

joaomoreno · joaomoreno · commit 2a1c377ba8a5 · 2017-11-02T08:47:45.000+01:00
diff --git a/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts b/src/vs/workbench/parts/scm/electron-browser/dirtydiffDecorator.ts
@@ -536,7 +536,6 @@ export class DirtyDiffController implements IEditorContribution {
 	close(): void {
 		this.session.dispose();
 		this.session = EmptyDisposable;
-		this.editor.focus();
 	}
 
 	private assertWidget(): boolean {
@@ -589,6 +588,7 @@ export class DirtyDiffController implements IEditorContribution {
 				this.widget = null;
 				this.currentIndex = -1;
 				this.isDirtyDiffVisible.set(false);
+				this.editor.focus();
 			})
 		);
 
