diff --git a/Composer/packages/client/src/pages/design/index.tsx b/Composer/packages/client/src/pages/design/index.tsx
index c33bc0bf90..b6ecf97f47 100644
--- a/Composer/packages/client/src/pages/design/index.tsx
+++ b/Composer/packages/client/src/pages/design/index.tsx
@@ -411,6 +411,7 @@ function DesignPage(props) {
                     hidden={triggerButtonVisible || !selected}
                     src={`${rootPath}/extensionContainer.html`}
                     ref={addRef}
+                    title={formatMessage('visual editor')}
                   />
                   {!selected && onRenderBlankVisual(triggerButtonVisible, openNewTriggerModal)}
                 </div>
@@ -419,6 +420,7 @@ function DesignPage(props) {
                   name="FormEditor"
                   css={formEditor}
                   src={`${rootPath}/extensionContainer.html`}
+                  title={formatMessage('form editor')}
                 />
               </div>
             </Fragment>
diff --git a/Composer/packages/client/src/pages/notifications/NotificationHeader.tsx b/Composer/packages/client/src/pages/notifications/NotificationHeader.tsx
index 5287df0a5c..2e67999ae5 100644
--- a/Composer/packages/client/src/pages/notifications/NotificationHeader.tsx
+++ b/Composer/packages/client/src/pages/notifications/NotificationHeader.tsx
@@ -11,10 +11,16 @@ import { notificationHeader, notificationHeaderText, dropdownStyles } from './st
 
 const createOptions = (): IDropdownOption[] => {
   const defaultOptions: IDropdownOption[] = [
-    { key: formatMessage('Show All Notifications'), text: formatMessage('All'), data: '', isSelected: true },
+    {
+      key: formatMessage('Show All Notifications'),
+      text: formatMessage('All'),
+      ariaLabel: formatMessage('Show All Notifications'),
+      data: '',
+      isSelected: true,
+    },
   ];
   DiagnosticSeverity.forEach(item => {
-    return defaultOptions.push({ key: item, text: item, data: item });
+    return defaultOptions.push({ key: item, text: item, data: item, ariaLabel: `Show ${item} Notifications` });
   });
   return defaultOptions;
 };