diff --git a/frontend/src/components/navigation/org.js b/frontend/src/components/navigation/org.js
index 8da19eb8..1ec9c7c0 100644
--- a/frontend/src/components/navigation/org.js
+++ b/frontend/src/components/navigation/org.js
@@ -81,6 +81,20 @@ const ManageTab = styled(Tab)`
   `}
 `;
 
+const DumbTab = ({
+  children
+}) => (
+  <NavLi activeClassName='active' to='#'>{({
+    isActive
+  }) =>
+    <NavigationLinkContainer className={isActive ? 'active' : ''}>
+      <OrgName>
+        {children}
+      </OrgName>
+    </NavigationLinkContainer>
+  }</NavLi>
+);
+
 const OrgNavigation = ({
   orgs = []
 }) => {
@@ -116,27 +130,11 @@ const OrgNavigation = ({
   });
 
   const manageTabs = () => (
-    <NavLi activeClassName='active' to='#'>{({
-      isActive
-    }) =>
-      <NavigationLinkContainer className={isActive ? 'active' : ''}>
-        <OrgName>
-          Manage Tabs ({orgs.length})
-        </OrgName>
-      </NavigationLinkContainer>
-    }</NavLi>
+    <DumbTab>Manage Tabs ({orgs.length})</DumbTab>
   );
 
   const addOrgTab = () => (
-    <NavLi activeClassName='active' to='#'>{({
-      isActive
-    }) =>
-      <NavigationLinkContainer className={isActive ? 'active' : ''}>
-        <OrgName>
-          + &nbsp; Add organisation
-        </OrgName>
-      </NavigationLinkContainer>
-    }</NavLi>
+    <DumbTab>+ &nbsp; Add organisation</DumbTab>
   );
 
   return (
@@ -157,6 +155,10 @@ OrgNavigation.propTypes = {
   orgs: React.PropTypes.arrayOf(PropTypes.org)
 };
 
+DumbTab.propTypes = {
+  children: React.PropTypes.node
+};
+
 const mapStateToProps = (state) => ({
   orgs: orgsSelector(state)
 });