diff --git a/src/core/client/ui/components/Tabs/Tab.tsx b/src/core/client/ui/components/Tabs/Tab.tsx
index 8e0390c42..fd7e99e0f 100644
--- a/src/core/client/ui/components/Tabs/Tab.tsx
+++ b/src/core/client/ui/components/Tabs/Tab.tsx
@@ -54,13 +54,13 @@ class Tab extends React.Component<TabProps> {
     return (
       <li
         className={styles.root}
-        key={`${tabId}-tab`}
-        id={`${tabId}-tab`}
+        key={tabId}
+        id={`tab-${tabId}`}
         role="presentation"
       >
         <BaseButton
           className={buttonClassName}
-          aria-controls={tabId}
+          aria-controls={`tabPane-${tabId}`}
           role="tab"
           aria-selected={active}
           onClick={this.handleTabClick}
diff --git a/src/core/client/ui/components/Tabs/TabPane.tsx b/src/core/client/ui/components/Tabs/TabPane.tsx
index 485eb5e53..a3c84480c 100644
--- a/src/core/client/ui/components/Tabs/TabPane.tsx
+++ b/src/core/client/ui/components/Tabs/TabPane.tsx
@@ -17,9 +17,9 @@ const TabPane: StatelessComponent<TabBarProps> = props => {
     <section
       className={className}
       key={tabId}
-      id={tabId}
+      id={`tabPane-${tabId}`}
       role="tabpanel"
-      aria-labelledby={`${tabId}-tab`}
+      aria-labelledby={`tab-${tabId}`}
     >
       {children}
     </section>