From b882e8334741f1764e7a9fd9567fc8f997ede263 Mon Sep 17 00:00:00 2001
From: Ben Yackley <61990921+beyackle@users.noreply.github.com>
Date: Mon, 29 Mar 2021 18:55:56 -0700
Subject: [PATCH] refocus locale dropdown after load (#6495)

Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
---
 .../src/pages/setting/app-settings/AppSettings.tsx       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Composer/packages/client/src/pages/setting/app-settings/AppSettings.tsx b/Composer/packages/client/src/pages/setting/app-settings/AppSettings.tsx
index 9b970c3833..466e9e9bb4 100644
--- a/Composer/packages/client/src/pages/setting/app-settings/AppSettings.tsx
+++ b/Composer/packages/client/src/pages/setting/app-settings/AppSettings.tsx
@@ -46,8 +46,12 @@ const AppSettings: React.FC<RouteComponentProps> = () => {
     updateUserSettings({ codeEditor: { [key]: value } });
   };
 
-  const onLocaleChange = (appLocale: string) => {
-    updateUserSettings({ appLocale });
+  const onLocaleChange = async (appLocale: string) => {
+    await updateUserSettings({ appLocale });
+
+    setTimeout(() => {
+      document.getElementById('appLanguage')?.focus();
+    }, 100);
   };
 
   const handleDataCollectionChange = (allowDataCollection: boolean) => {
@@ -99,6 +103,7 @@ const AppSettings: React.FC<RouteComponentProps> = () => {
           <h2>{formatMessage('Application Language settings')}</h2>
           <SettingDropdown
             description={formatMessage('This is the language used for Composer’s user interface.')}
+            id={'appLanguage'}
             options={languageOptions}
             selected={userSettings.appLocale}
             title={formatMessage('Application language')}