diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7e23715c..e2b7fa577 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - [1916](https://github.com/microsoft/BotFramework-Emulator/pull/1916)
   - [1917](https://github.com/microsoft/BotFramework-Emulator/pull/1917)
   - [1918](https://github.com/microsoft/BotFramework-Emulator/pull/1918)
+  - [1921](https://github.com/microsoft/BotFramework-Emulator/pull/1921)
  
  - [client] Fixed an issue with the transcripts path input inside of the resource settings dialog in PR [1836](https://github.com/microsoft/BotFramework-Emulator/pull/1836)
  - [client] Implemented HTML app menu for Windows in PR [1893](https://github.com/microsoft/BotFramework-Emulator/pull/1893) 
diff --git a/packages/app/client/src/ui/dialogs/botCreationDialog/botCreationDialog.tsx b/packages/app/client/src/ui/dialogs/botCreationDialog/botCreationDialog.tsx
index 2bcdbd730..adfcbde8c 100644
--- a/packages/app/client/src/ui/dialogs/botCreationDialog/botCreationDialog.tsx
+++ b/packages/app/client/src/ui/dialogs/botCreationDialog/botCreationDialog.tsx
@@ -187,11 +187,12 @@ export class BotCreationDialog extends React.Component<BotCreationDialogProps, B
           </Row>
           <Row align={RowAlignment.Bottom} justify={RowJustification.Left}>
             <TextField
+              aria-label="Bot encryption key"
               inputContainerClassName={dialogStyles.key}
               inputRef={this.setSecretInputRef}
               label="Secret "
               value={secret}
-              placeholder="Your keys are not encrypted"
+              placeholder={encryptKey ? '' : 'Your keys are not encrypted'}
               disabled={true}
               id="key-input"
               type={revealSecret ? 'text' : 'password'}
@@ -208,7 +209,12 @@ export class BotCreationDialog extends React.Component<BotCreationDialogProps, B
                 </LinkButton>
               </li>
               <li>
-                <LinkButton className={dialogStyles.dialogLink} disabled={!encryptKey} onClick={this.onCopyClick}>
+                <LinkButton
+                  ariaLabel="Copy secret"
+                  className={dialogStyles.dialogLink}
+                  disabled={!encryptKey}
+                  onClick={this.onCopyClick}
+                >
                   Copy
                 </LinkButton>
               </li>
diff --git a/packages/app/client/src/ui/dialogs/dialogStyles.scss b/packages/app/client/src/ui/dialogs/dialogStyles.scss
index c474e5d60..e0ac0cb48 100644
--- a/packages/app/client/src/ui/dialogs/dialogStyles.scss
+++ b/packages/app/client/src/ui/dialogs/dialogStyles.scss
@@ -42,9 +42,10 @@
 }
 
 .actions-list {
+  display: flex;
   list-style: none;
   padding: 0;
-  margin: 0 0 15px 0;
+  margin: 0 0 10px 0;
 
   li {
     display: inline;