diff --git a/src/components/Tabs/Tabs.svelte b/src/components/Tabs/Tabs.svelte
index b43ce0e1..b012e2d7 100644
--- a/src/components/Tabs/Tabs.svelte
+++ b/src/components/Tabs/Tabs.svelte
@@ -8,7 +8,7 @@
   export let triggerHref = '#';
   export let type = 'default';
 
-  import { createEventDispatcher, setContext } from 'svelte';
+  import { createEventDispatcher, afterUpdate, setContext } from 'svelte';
   import { writable, derived } from 'svelte/store';
   import ChevronDownGlyph from 'carbon-icons-svelte/lib/ChevronDownGlyph';
   import { cx } from '../../lib';
@@ -62,10 +62,14 @@
     }
   });
 
+  afterUpdate(() => {
+    selected = currentIndex;
+  });
+
+  $: currentIndex = selected;
   $: currentTab = $tabs[currentIndex] || undefined;
   $: currentContent = $content[currentIndex] || undefined;
   $: {
-    selected = currentIndex;
     dispatch('change', currentIndex);
 
     if (currentTab) {