From c975752a85031eef6c40b03221c8625cfb50be00 Mon Sep 17 00:00:00 2001
From: SteVen Batten <stbatt@microsoft.com>
Date: Mon, 15 Jul 2019 17:30:29 -0700
Subject: [PATCH] fixes #77430

---
 src/vs/base/browser/ui/dialog/dialog.ts | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/vs/base/browser/ui/dialog/dialog.ts b/src/vs/base/browser/ui/dialog/dialog.ts
index a33545b641e..2e95c5955ac 100644
--- a/src/vs/base/browser/ui/dialog/dialog.ts
+++ b/src/vs/base/browser/ui/dialog/dialog.ts
@@ -99,6 +99,14 @@ export class Dialog extends Disposable {
 			let focusedButton = 0;
 			const buttonGroup = this.buttonGroup = new ButtonGroup(this.buttonsContainer, this.buttons.length, { title: true });
 			const buttonMap = this.rearrangeButtons(this.buttons, this.options.cancelId);
+
+			// Set focused button to UI index
+			buttonMap.forEach((value, index) => {
+				if (value.index === 0) {
+					focusedButton = index;
+				}
+			});
+
 			buttonGroup.buttons.forEach((button, index) => {
 				button.label = mnemonicButtonLabel(buttonMap[index].label, true);
 
@@ -190,11 +198,7 @@ export class Dialog extends Disposable {
 			show(this.element);
 
 			// Focus first element
-			buttonMap.forEach((value, index) => {
-				if (value.index === focusedButton) {
-					buttonGroup.buttons[index].focus();
-				}
-			});
+			buttonGroup.buttons[focusedButton].focus();
 		});
 	}
 
-- 
GitLab