diff --git a/src/lib/components/Org/Settings/index.svelte b/src/lib/components/Org/Settings/index.svelte
index 10d1dbce..379f41f5 100644
--- a/src/lib/components/Org/Settings/index.svelte
+++ b/src/lib/components/Org/Settings/index.svelte
@@ -1,14 +1,64 @@
 <script>
+  import { page } from '$app/stores';
   import { Tabs, Tab, TabContent } from 'carbon-components-svelte';
   import Profile from './Profile.svelte';
   // import Account from './Account.svelte';
   import OrgSettings from './OrgSettings.svelte';
+  import { onMount } from 'svelte';
+  import { browser } from '$app/environment';
+  import { goto } from '$app/navigation';
+
+  let selected = 0;
+  let query = new URLSearchParams($page.url.search);
+  let tabKey = query.get('tab') || '';
+
+  const tabs = [
+    {
+      key: 0,
+      label: 'Profile',
+      tabKey: '',
+      href: $page.url.pathname
+    },
+    {
+      key: 1,
+      label: 'Organization Settings',
+      tabKey: 'org',
+      href: `${$page.url.pathname}?tab=org`
+    }
+  ];
+
+  function getSelectedByTab(tabKey = '') {
+    const tab = tabs.find((t) => t.tabKey === tabKey);
+    console.log('tab', tab);
+    if (tab) {
+      return tab.key;
+    }
+
+    return 0;
+  }
+  function changeRouteOnTabChange(key = 0) {
+    const tab = tabs.find((t) => t.key === key);
+    if (tab) {
+      return goto(tab.href);
+    }
+  }
+
+  onMount(() => {
+    selected = getSelectedByTab(tabKey);
+  });
+
+  $: {
+    if (browser) {
+      changeRouteOnTabChange(selected);
+    }
+  }
 </script>
 
-<Tabs autoWidth>
-  <Tab label="Profile" />
+<Tabs autoWidth bind:selected>
+  {#each tabs as tab}
+    <Tab label={tab.label} href={tab.href} />
+  {/each}
   <!-- <Tab label="Account" /> -->
-  <Tab label="Organization Settings" />
   <svelte:fragment slot="content">
     <TabContent>
       <Profile />