diff --git a/apps/dashboard/src/lib/features/course/components/ceritficate/certificate-edit.svelte b/apps/dashboard/src/lib/features/course/components/ceritficate/certificate-edit.svelte
index 594e7f8b..4c489245 100644
--- a/apps/dashboard/src/lib/features/course/components/ceritficate/certificate-edit.svelte
+++ b/apps/dashboard/src/lib/features/course/components/ceritficate/certificate-edit.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-  import { page } from '$app/state';
   import * as UnderlineTabs from '@cio/ui/custom/underline-tabs';
   import { t } from '$lib/utils/functions/translations';
 
@@ -11,25 +10,16 @@
   type Props = {
     errors: Record<string, string>;
     activeTab?: string;
+    onActiveTabChange?: (tab: string) => void;
   };
 
-  let { errors }: Props = $props();
-
-  let activeTab = $state('design');
-
-  // Initialize activeTab from URL parameter if present
-  $effect(() => {
-    const tabParam = page.url.searchParams.get('tab');
-    if (tabParam && (tabParam === 'design' || tabParam === 'settings')) {
-      activeTab = tabParam;
-    }
-  });
+  let { errors, activeTab = 'design', onActiveTabChange }: Props = $props();
 </script>
 
 <UpgradeBanner>{$t('upgrade.certificate')}</UpgradeBanner>
 
 <main class="px-2 md:-mr-3 md:-ml-3">
-  <UnderlineTabs.Root bind:value={activeTab} class="w-full">
+  <UnderlineTabs.Root value={activeTab} onValueChange={(value) => onActiveTabChange?.(value)} class="w-full">
     <UnderlineTabs.List>
       <UnderlineTabs.Trigger value="design">
         {$t('course.navItem.certificates.tab_design')}
diff --git a/apps/dashboard/src/lib/features/course/pages/certificates.svelte b/apps/dashboard/src/lib/features/course/pages/certificates.svelte
index fc85dd51..1b8212fa 100644
--- a/apps/dashboard/src/lib/features/course/pages/certificates.svelte
+++ b/apps/dashboard/src/lib/features/course/pages/certificates.svelte
@@ -7,15 +7,16 @@
   type Props = {
     errors: Record<string, string>;
     activeTab?: string;
+    onActiveTabChange?: (tab: string) => void;
   };
 
-  let { errors, activeTab = $bindable('design') }: Props = $props();
+  let { errors, activeTab = 'design', onActiveTabChange }: Props = $props();
 </script>
 
 <IssueCertificateModal />
 
 <RoleBasedSecurity allowedRoles={[1, 2]}>
-  <CertificateEdit {errors} bind:activeTab />
+  <CertificateEdit {errors} {activeTab} {onActiveTabChange} />
 </RoleBasedSecurity>
 <RoleBasedSecurity onlyStudent allowedRoles={[3]}>
   <StudentCertificate />
diff --git a/apps/dashboard/src/routes/(app)/courses/[id]/certificates/+page.svelte b/apps/dashboard/src/routes/(app)/courses/[id]/certificates/+page.svelte
index 0bca3c10..5c71c478 100644
--- a/apps/dashboard/src/routes/(app)/courses/[id]/certificates/+page.svelte
+++ b/apps/dashboard/src/routes/(app)/courses/[id]/certificates/+page.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+  import { page } from '$app/state';
+  import { goto } from '$app/navigation';
+  import { resolve } from '$app/paths';
   import { CertificatesPage } from '$features/course/pages';
   import * as Page from '@cio/ui/base/page';
   import { t } from '$lib/utils/functions/translations';
@@ -14,7 +17,12 @@
   import { openUpgradeModal } from '$lib/utils/functions/org';
 
   let errors = $state<Record<string, string>>({});
-  let certificateActiveTab = $state('design');
+
+  const certificateActiveTab = $derived.by(() => {
+    const tabInParam = page.url.searchParams.get('tab');
+    return tabInParam === 'settings' ? 'settings' : 'design';
+  });
+
   let hasUnsavedChanges = $state(false);
   let savedCertificateState = $state<string | null>(null);
   let savedCertificateStateCourseId = $state<string | null>(null);
@@ -134,6 +142,15 @@
     hasUnsavedChanges = false;
     errors = {};
   }
+
+  function handleActiveTabChange(tab: string) {
+    const url = new URL(page.url);
+    url.searchParams.set('tab', tab);
+  function handleActiveTabChange(tab: string) {
+    const url = new URL(page.url);
+    url.searchParams.set('tab', tab);
+    replaceState(url, {});
+  }
 </script>
 
 <svelte:head>
@@ -160,7 +177,7 @@
   </Page.Header>
   <Page.Body>
     {#snippet child()}
-      <CertificatesPage {errors} bind:activeTab={certificateActiveTab} />
+      <CertificatesPage {errors} activeTab={certificateActiveTab} onActiveTabChange={handleActiveTabChange} />
     {/snippet}
   </Page.Body>
   {#if canEditCertificates && certificateActiveTab === 'settings'}