diff --git a/src/core/client/ui/components/Tabs/Tab.tsx b/src/core/client/ui/components/Tabs/Tab.tsx
index 87b4ba236..a0b23c0aa 100644
--- a/src/core/client/ui/components/Tabs/Tab.tsx
+++ b/src/core/client/ui/components/Tabs/Tab.tsx
@@ -1,9 +1,9 @@
 import cn from "classnames";
-import React, { StatelessComponent } from "react";
+import React from "react";
 import { withStyles } from "talk-ui/hocs";
 import * as styles from "./Tab.css";
 
-export interface TabBarProps {
+export interface TabProps {
   /**
    * Convenient prop to override the root styling.
    */
@@ -30,7 +30,7 @@ export interface TabBarProps {
   onTabClick?: (tabId: string) => void;
 }
 
-class TabBar extends React.Component<TabBarProps> {
+class Tab extends React.Component<TabProps> {
   public handleTabClick = () => {
     if (this.props.onTabClick) {
       this.props.onTabClick(this.props.tabId);
@@ -53,7 +53,7 @@ class TabBar extends React.Component<TabBarProps> {
     return (
       <li
         className={rootClassName}
-        key={tabId}
+        key={`${tabId}-tab`}
         id={`${tabId}-tab`}
         role="tab"
         onClick={this.handleTabClick}
@@ -66,5 +66,5 @@ class TabBar extends React.Component<TabBarProps> {
   }
 }
 
-const enhanced = withStyles(styles)(TabBar);
+const enhanced = withStyles(styles)(Tab);
 export default enhanced;
diff --git a/src/core/client/ui/components/Tabs/TabBar.tsx b/src/core/client/ui/components/Tabs/TabBar.tsx
index 46427f3cd..f614cce4f 100644
--- a/src/core/client/ui/components/Tabs/TabBar.tsx
+++ b/src/core/client/ui/components/Tabs/TabBar.tsx
@@ -55,7 +55,7 @@ const TabBar: StatelessComponent<TabBarProps> = props => {
   const tabs = React.Children.toArray(children).map(
     (child: React.ReactElement<any>, index: number) =>
       React.cloneElement(child, {
-        index,
+        tabId: child.props.tabId ? child.props.tabId : index,
         active:
           defaultActiveTab && !activeTab
             ? child.props.tabId === defaultActiveTab