diff --git a/packages/core/src/layout/HeaderTabs/HeaderTabs.tsx b/packages/core/src/layout/HeaderTabs/HeaderTabs.tsx
new file mode 100644
index 0000000000..b509cae14f
--- /dev/null
+++ b/packages/core/src/layout/HeaderTabs/HeaderTabs.tsx
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// TODO(blam): Remove this implementation when the Tabs are ready
+// This is just a temporary solution to implementing tabs for now
+
+import React, { useState, useEffect } from 'react';
+import { makeStyles, Tabs, Tab } from '@material-ui/core';
+
+const useStyles = makeStyles(theme => ({
+  tabsWrapper: {
+    gridArea: 'pageSubheader',
+    backgroundColor: theme.palette.background.paper,
+    paddingLeft: theme.spacing(3),
+  },
+  defaultTab: {
+    padding: theme.spacing(3, 3),
+    ...theme.typography.caption,
+    textTransform: 'uppercase',
+    fontWeight: 'bold',
+    color: theme.palette.text.secondary,
+  },
+  selected: {
+    color: theme.palette.text.primary,
+  },
+}));
+
+export type Tab = {
+  id: string;
+  label: string;
+};
+
+export const HeaderTabs: React.FC<{
+  tabs: Tab[];
+  onChange?: (index: number) => void;
+  selectedIndex?: number;
+}> = ({ tabs, onChange, selectedIndex }) => {
+  const [selectedTab, setSelectedTab] = useState<number>(selectedIndex ?? 0);
+  const styles = useStyles();
+
+  const handleChange = (_: React.ChangeEvent<{}>, index: number) => {
+    if (selectedIndex === undefined) {
+      setSelectedTab(index);
+    }
+    if (onChange) onChange(index);
+  };
+
+  useEffect(() => {
+    if (selectedIndex !== undefined) {
+      setSelectedTab(selectedIndex);
+    }
+  }, [selectedIndex]);
+
+  return (
+    <div className={styles.tabsWrapper}>
+      <Tabs
+        indicatorColor="primary"
+        textColor="inherit"
+        variant="scrollable"
+        scrollButtons="auto"
+        aria-label="scrollable auto tabs example"
+        onChange={handleChange}
+        value={selectedTab}
+      >
+        {tabs.map((tab, index) => (
+          <Tab
+            label={tab.label}
+            key={tab.id}
+            value={index}
+            className={styles.defaultTab}
+            classes={{ selected: styles.selected }}
+          />
+        ))}
+      </Tabs>
+    </div>
+  );
+};
diff --git a/packages/core/src/layout/HeaderTabs/index.tsx b/packages/core/src/layout/HeaderTabs/index.tsx
index b509cae14f..9a37f20af9 100644
--- a/packages/core/src/layout/HeaderTabs/index.tsx
+++ b/packages/core/src/layout/HeaderTabs/index.tsx
@@ -14,77 +14,4 @@
  * limitations under the License.
  */
 
-// TODO(blam): Remove this implementation when the Tabs are ready
-// This is just a temporary solution to implementing tabs for now
-
-import React, { useState, useEffect } from 'react';
-import { makeStyles, Tabs, Tab } from '@material-ui/core';
-
-const useStyles = makeStyles(theme => ({
-  tabsWrapper: {
-    gridArea: 'pageSubheader',
-    backgroundColor: theme.palette.background.paper,
-    paddingLeft: theme.spacing(3),
-  },
-  defaultTab: {
-    padding: theme.spacing(3, 3),
-    ...theme.typography.caption,
-    textTransform: 'uppercase',
-    fontWeight: 'bold',
-    color: theme.palette.text.secondary,
-  },
-  selected: {
-    color: theme.palette.text.primary,
-  },
-}));
-
-export type Tab = {
-  id: string;
-  label: string;
-};
-
-export const HeaderTabs: React.FC<{
-  tabs: Tab[];
-  onChange?: (index: number) => void;
-  selectedIndex?: number;
-}> = ({ tabs, onChange, selectedIndex }) => {
-  const [selectedTab, setSelectedTab] = useState<number>(selectedIndex ?? 0);
-  const styles = useStyles();
-
-  const handleChange = (_: React.ChangeEvent<{}>, index: number) => {
-    if (selectedIndex === undefined) {
-      setSelectedTab(index);
-    }
-    if (onChange) onChange(index);
-  };
-
-  useEffect(() => {
-    if (selectedIndex !== undefined) {
-      setSelectedTab(selectedIndex);
-    }
-  }, [selectedIndex]);
-
-  return (
-    <div className={styles.tabsWrapper}>
-      <Tabs
-        indicatorColor="primary"
-        textColor="inherit"
-        variant="scrollable"
-        scrollButtons="auto"
-        aria-label="scrollable auto tabs example"
-        onChange={handleChange}
-        value={selectedTab}
-      >
-        {tabs.map((tab, index) => (
-          <Tab
-            label={tab.label}
-            key={tab.id}
-            value={index}
-            className={styles.defaultTab}
-            classes={{ selected: styles.selected }}
-          />
-        ))}
-      </Tabs>
-    </div>
-  );
-};
+export { HeaderTabs } from './HeaderTabs';