diff --git a/src/lib/studio/domains/manage/table.svelte b/src/lib/studio/domains/manage/table.svelte
index 9f44181ef2..bf03bb8a00 100644
--- a/src/lib/studio/domains/manage/table.svelte
+++ b/src/lib/studio/domains/manage/table.svelte
@@ -22,8 +22,6 @@
         Skeleton,
         Divider
     } from '@appwrite.io/pink-svelte';
-    import { resolve } from '$app/paths';
-    import { goto } from '$app/navigation';
     import { Click, trackEvent } from '$lib/actions/analytics';
     import { regionalProtocol } from '$routes/(console)/project-[region]-[project]/store';
     import DeleteDomainModal from '$routes/(console)/project-[region]-[project]/sites/site-[site]/domains/deleteDomainModal.svelte';
@@ -32,11 +30,13 @@
     let {
         siteId,
         region,
-        projectId
+        projectId,
+        onAddNewDomain = null
     }: {
         siteId: string;
         region: string;
         projectId: string;
+        onAddNewDomain?: () => void;
     } = $props();
 
     let loading = $state(true);
@@ -82,18 +82,6 @@
         previousDeleteState = showDelete;
         previousRetryState = showRetry;
     });
-
-    const addDomainUrl = $derived.by(() => {
-        const baseUrl = resolve(
-            '/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain',
-            {
-                region,
-                project: projectId,
-                site: siteId
-            }
-        );
-        return `${baseUrl}?types=false`;
-    });
 </script>
 
 <Table.Root columns={[{ id: 'domain' }, { id: 'actions', width: 40 }]} let:root>
@@ -164,7 +152,7 @@
 </Table.Root>
 
 <Layout.Stack style="width: min-content;">
-    <Button compact on:onclick={async () => await goto(addDomainUrl)}>
+    <Button compact on:click={() => onAddNewDomain?.()}>
         <Icon icon={IconPlus} size="s" />
         Add domain
     </Button>
diff --git a/src/lib/studio/domains/manage/view.svelte b/src/lib/studio/domains/manage/view.svelte
index 63220024ab..6212318fc1 100644
--- a/src/lib/studio/domains/manage/view.svelte
+++ b/src/lib/studio/domains/manage/view.svelte
@@ -10,13 +10,15 @@
         domain,
         siteId,
         region,
-        projectId
+        projectId,
+        onAddNewDomain = null
     }: {
         show: boolean;
         domain: string;
         siteId: string;
         region: string;
         projectId: string;
+        onAddNewDomain?: () => void;
     } = $props();
 </script>
 
@@ -40,6 +42,6 @@
             </Typography.Text>
         </Layout.Stack>
 
-        <DomainsTable {siteId} {region} {projectId} />
+        <DomainsTable {siteId} {region} {projectId} {onAddNewDomain} />
     </Layout.Stack>
 </SideSheet>
diff --git a/src/lib/studio/domains/verify/view.svelte b/src/lib/studio/domains/verify/view.svelte
index 045c26b21d..9c1982d30f 100644
--- a/src/lib/studio/domains/verify/view.svelte
+++ b/src/lib/studio/domains/verify/view.svelte
@@ -107,7 +107,7 @@
 </script>
 
 {#if show}
-    <Wizard column columnSize="s" title="Add domain" showExitModal onExit={() => (show = false)}>
+    <Wizard column columnSize="s" title="Add domain" confirmExit onExit={() => (show = false)}>
         <Form onSubmit={verify} bind:isSubmitting>
             <Layout.Stack gap="xxl">
                 <Card.Base radius="s" padding="s">
diff --git a/src/lib/studio/studio.svelte b/src/lib/studio/studio.svelte
index 66ad208fde..283ca5f6e5 100644
--- a/src/lib/studio/studio.svelte
+++ b/src/lib/studio/studio.svelte
@@ -106,4 +106,8 @@
     {region}
     {projectId}
     domain={primaryDomainForSite}
-    bind:show={showManageDomainsSheet} />
+    bind:show={showManageDomainsSheet}
+    onAddNewDomain={() => {
+        showAddDomainsWizard = true;
+        showManageDomainsSheet = false;
+    }} />