diff --git a/src/Tabs/Tab.svelte b/src/Tabs/Tab.svelte
index 2e830a4a..6b710c9a 100644
--- a/src/Tabs/Tab.svelte
+++ b/src/Tabs/Tab.svelte
@@ -51,7 +51,6 @@
 <li
   tabindex="-1"
   role="presentation"
-  {id}
   class:bx--tabs__nav-item={true}
   class:bx--tabs__nav-item--disabled={disabled}
   class:bx--tabs__nav-item--selected={selected}
@@ -81,6 +80,7 @@
     tabindex={disabled ? '-1' : tabindex}
     aria-selected={selected}
     aria-disabled={disabled}
+    {id}
     {href}
     class:bx--tabs__nav-link={true}>
     <slot>{label}</slot>
diff --git a/src/Tabs/Tabs.svelte b/src/Tabs/Tabs.svelte
index 6bcde363..98059272 100644
--- a/src/Tabs/Tabs.svelte
+++ b/src/Tabs/Tabs.svelte
@@ -33,12 +33,16 @@
   const tabsById = derived(tabs, (_) =>
     _.reduce((a, c) => ({ ...a, [c.id]: c }), {})
   );
-
   const selectedTab = writable(undefined);
   const content = writable([]);
+  const contentById = derived(content, (_) =>
+    _.reduce((a, c) => ({ ...a, [c.id]: c }), {})
+  );
   const selectedContent = writable(undefined);
 
   setContext("Tabs", {
+    tabs,
+    contentById,
     selectedTab,
     selectedContent,
     add: (data) => {