diff --git a/apps/www/e2e/marketing-homepage.spec.ts b/apps/www/e2e/marketing-homepage.spec.ts
index c5706b107..89aa88bf2 100644
--- a/apps/www/e2e/marketing-homepage.spec.ts
+++ b/apps/www/e2e/marketing-homepage.spec.ts
@@ -32,11 +32,10 @@ test.describe("marketing homepage", () => {
     await selfHost.scrollIntoViewIfNeeded();
     await captureScreenshot(page, testInfo, "01-marketing-homepage-selfhost");
 
-    await expect(async () => {
-      await selfHost.getByRole("button", { name: /Get started/i }).click();
-      await expect(page.getByRole("dialog")).toBeVisible();
-    }).toPass();
-    const dialog = page.getByRole("dialog");
+    await expect(page.locator("html")).toHaveAttribute("data-get-started-ready", "");
+    await selfHost.getByRole("button", { name: /Get started/i }).click();
+    const dialog = page.locator("[data-get-started-dialog]");
+    await expect(dialog).toBeVisible();
     await expect(dialog.getByRole("heading")).toBeVisible();
     await expect(dialog).not.toContainText(
       /openssl|docker-compose\.images|POSTGRES_PASSWORD|BETTER_AUTH_SECRET|mkdir rakazo/i,
@@ -64,11 +63,10 @@ test.describe("marketing homepage", () => {
     await selfHost.scrollIntoViewIfNeeded();
     await captureScreenshot(page, testInfo, "03-marketing-homepage-zh-selfhost");
 
-    await expect(async () => {
-      await selfHost.getByRole("button", { name: "开始使用" }).click();
-      await expect(page.getByRole("dialog")).toBeVisible();
-    }).toPass();
-    const dialog = page.getByRole("dialog");
+    await expect(page.locator("html")).toHaveAttribute("data-get-started-ready", "");
+    await selfHost.getByRole("button", { name: "开始使用" }).click();
+    const dialog = page.locator("[data-get-started-dialog]");
+    await expect(dialog).toBeVisible();
     await expect(dialog.getByRole("heading")).toHaveText("你想如何开始？");
     await expect(dialog).not.toContainText(
       /openssl|docker-compose\.images|POSTGRES_PASSWORD|BETTER_AUTH_SECRET|mkdir rakazo/i,
diff --git a/apps/www/src/components/GetStartedDialog.astro b/apps/www/src/components/GetStartedDialog.astro
index 020461278..be32fd079 100644
--- a/apps/www/src/components/GetStartedDialog.astro
+++ b/apps/www/src/components/GetStartedDialog.astro
@@ -79,67 +79,81 @@ const { copy, waitlist } = Astro.props;
   </div>
 </dialog>
 
-<script>
-  const dialog = document.querySelector<HTMLDialogElement>("[data-get-started-dialog]");
-  const openers = document.querySelectorAll<HTMLButtonElement>("[data-get-started-open]");
-  const closeButtons = dialog?.querySelectorAll<HTMLButtonElement>("[data-get-started-close]");
-  const choice = dialog?.querySelector<HTMLElement>("[data-get-started-choice]");
-  const signup = dialog?.querySelector<HTMLElement>("[data-get-started-signup]");
-  const success = dialog?.querySelector<HTMLElement>("[data-get-started-success]");
-  const successTitle = dialog?.querySelector<HTMLElement>("[data-get-started-success-title]");
-  const email = dialog?.querySelector<HTMLInputElement>("input[type='email']");
-  const selfHostBtn = dialog?.querySelector<HTMLButtonElement>("[data-get-started-selfhost]");
-  const cloudBtn = dialog?.querySelector<HTMLButtonElement>("[data-get-started-cloud]");
-  const backBtn = dialog?.querySelector<HTMLButtonElement>("[data-get-started-back]");
-
-  function showChoice() {
-    if (!choice || !signup || !success) return;
-    choice.hidden = false;
-    signup.hidden = true;
-    success.hidden = true;
-    dialog?.setAttribute("aria-labelledby", "get-started-title");
-  }
-
-  function showCloud() {
-    if (!choice || !signup || !success) return;
-    choice.hidden = true;
-    signup.hidden = false;
-    success.hidden = true;
-    dialog?.setAttribute("aria-labelledby", "get-started-cloud-title");
-    window.requestAnimationFrame(() => email?.focus());
-  }
-
-  openers.forEach((opener) => {
-    opener.addEventListener("click", () => {
-      if (!dialog || dialog.open) return;
-      showChoice();
-      dialog.showModal();
-      window.requestAnimationFrame(() => selfHostBtn?.focus());
+<script is:inline>
+  (function () {
+    const dialog = document.querySelector("[data-get-started-dialog]");
+    if (!dialog) return;
+
+    const choice = dialog.querySelector("[data-get-started-choice]");
+    const signup = dialog.querySelector("[data-get-started-signup]");
+    const success = dialog.querySelector("[data-get-started-success]");
+    const successTitle = dialog.querySelector("[data-get-started-success-title]");
+    const email = dialog.querySelector("input[type='email']");
+    const selfHostBtn = dialog.querySelector("[data-get-started-selfhost]");
+
+    function showChoice() {
+      if (!choice || !signup || !success) return;
+      choice.hidden = false;
+      signup.hidden = true;
+      success.hidden = true;
+      dialog.setAttribute("aria-labelledby", "get-started-title");
+    }
+
+    function showCloud() {
+      if (!choice || !signup || !success) return;
+      choice.hidden = true;
+      signup.hidden = false;
+      success.hidden = true;
+      dialog.setAttribute("aria-labelledby", "get-started-cloud-title");
+      window.requestAnimationFrame(() => email?.focus());
+    }
+
+    document.addEventListener("click", (event) => {
+      const target = event.target;
+      if (!(target instanceof Element)) return;
+
+      if (target.closest("[data-get-started-open]")) {
+        if (dialog.open) return;
+        showChoice();
+        dialog.showModal();
+        window.requestAnimationFrame(() => selfHostBtn?.focus());
+        return;
+      }
+
+      if (target.closest("[data-get-started-close]")) {
+        dialog.close();
+        return;
+      }
+
+      if (target.closest("[data-get-started-selfhost]")) {
+        dialog.close();
+        document.getElementById("selfhost")?.scrollIntoView({ behavior: "smooth" });
+        return;
+      }
+
+      if (target.closest("[data-get-started-cloud]")) {
+        showCloud();
+        return;
+      }
+
+      if (target.closest("[data-get-started-back]")) {
+        showChoice();
+      }
+    });
+
+    dialog.addEventListener("click", (event) => {
+      if (event.target === dialog) dialog.close();
     });
-  });
-
-  selfHostBtn?.addEventListener("click", () => {
-    dialog?.close();
-    document.getElementById("selfhost")?.scrollIntoView({ behavior: "smooth" });
-  });
-
-  cloudBtn?.addEventListener("click", () => showCloud());
-  backBtn?.addEventListener("click", () => showChoice());
-
-  closeButtons?.forEach((button) => {
-    button.addEventListener("click", () => dialog?.close());
-  });
-
-  dialog?.addEventListener("click", (event) => {
-    if (event.target === dialog) dialog.close();
-  });
-
-  dialog?.addEventListener("waitlist:joined", () => {
-    if (!choice || !signup || !success) return;
-    choice.hidden = true;
-    signup.hidden = true;
-    success.hidden = false;
-    dialog.setAttribute("aria-labelledby", "get-started-success-title");
-    successTitle?.focus();
-  });
+
+    dialog.addEventListener("waitlist:joined", () => {
+      if (!choice || !signup || !success) return;
+      choice.hidden = true;
+      signup.hidden = true;
+      success.hidden = false;
+      dialog.setAttribute("aria-labelledby", "get-started-success-title");
+      successTitle?.focus();
+    });
+
+    document.documentElement.dataset.getStartedReady = "";
+  })();
 </script>
diff --git a/apps/www/src/components/HomePage.astro b/apps/www/src/components/HomePage.astro
index 737f00b4b..eff67a1e3 100644
--- a/apps/www/src/components/HomePage.astro
+++ b/apps/www/src/components/HomePage.astro
@@ -123,6 +123,8 @@ const structuredData = {
     <Header locale={locale} copy={copy.nav} starsLabel={starsLabel} homeHref={homeHref} />
 
     <main id="main">
+      <GetStartedDialog copy={copy.getStartedDialog} waitlist={copy.waitlist} />
+
       <section class="hero">
         <a class="hero__pill" href="#selfhost">
           <span class="hero__badge">{copy.hero.badge}</span>
@@ -279,8 +281,6 @@ const structuredData = {
           }
         </div>
       </section>
-
-      <GetStartedDialog copy={copy.getStartedDialog} waitlist={copy.waitlist} />
     </main>
 
     <Footer