diff --git a/README.md b/README.md
index 4cabfb0..52766e4 100644
--- a/README.md
+++ b/README.md
@@ -41,8 +41,14 @@ npm install astro-theme-toggle
    </button>
 
    <script>
-     import { handleToggleClick } from 'astro-theme-toggle';
-     document.getElementById('theme-toggle')?.addEventListener('click', handleToggleClick);
+    import { handleToggleClick } from 'astro-theme-toggle'
+    const addListener = () => {
+      document
+        .getElementById('theme-toggle')
+        ?.addEventListener('click', handleToggleClick)
+    }
+    addListener()
+    document.addEventListener('astro:after-swap', addListener)
    </script>
 
    <style is:global>
diff --git a/build.sh b/build.sh
index b2cb37c..3fe9edc 100644
--- a/build.sh
+++ b/build.sh
@@ -2,7 +2,7 @@ cd $(dirname $0)
 export PATH=$PATH:$PWD/node_modules/.bin
 
 esbuild --minify --bundle --outdir=temp lib/theme-script.ts
-cp lib/theme-style.astro lib/theme-script.astro
+echo "" > lib/theme-script.astro
 echo "<script is:inline>" >> lib/theme-script.astro
 cat temp/theme-script.js >> lib/theme-script.astro
 echo "</script>" >> lib/theme-script.astro
diff --git a/lib/handle-toggle-click.ts b/lib/handle-toggle-click.ts
index 67d1f56..342865a 100644
--- a/lib/handle-toggle-click.ts
+++ b/lib/handle-toggle-click.ts
@@ -1,5 +1,22 @@
 import { toggleTheme } from './theme'
 
+const STYLE_ID = 'astro-theme-toggle-temporary-styles'
+const STYLE_CONTENT =
+  '::view-transition-old(root), ::view-transition-new(root) { animation: none; mix-blend-mode: normal; }'
+
+function removeTemporaryStyles() {
+  const style = document.getElementById(STYLE_ID)
+  style?.remove()
+}
+
+function injectTemporaryStyles() {
+  removeTemporaryStyles()
+  const style = document.createElement('style')
+  style.id = STYLE_ID
+  style.textContent = STYLE_CONTENT
+  document.head.appendChild(style)
+}
+
 async function startCircleAnimation(
   callback: () => void,
   x: number,
@@ -8,6 +25,7 @@ async function startCircleAnimation(
   const doc = document as unknown as {
     startViewTransition?: (updateCallback?: () => unknown) => {
       ready?: Promise<void>
+      finished?: Promise<void>
     }
   }
 
@@ -16,9 +34,14 @@ async function startCircleAnimation(
     return
   }
 
-  await doc.startViewTransition(() => {
+  injectTemporaryStyles()
+
+  const transition = doc.startViewTransition(() => {
     callback()
-  })?.ready
+  })
+
+  await transition?.ready
+  void transition?.finished?.then(removeTemporaryStyles)
 
   const gradientOffset = 0.7
   const maskSvg = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><defs><radialGradient id="toggle-theme-gradient"><stop offset="${gradientOffset}"/><stop offset="1" stop-opacity="0"/></radialGradient></defs><circle cx="4" cy="4" r="4" fill="url(#toggle-theme-gradient)"/></svg>`
diff --git a/lib/theme-script.astro b/lib/theme-script.astro
index d8ed964..a77ea54 100644
--- a/lib/theme-script.astro
+++ b/lib/theme-script.astro
@@ -1,10 +1,4 @@
-<style is:global>
-  ::view-transition-old(root),
-  ::view-transition-new(root) {
-    animation: none;
-    mix-blend-mode: normal;
-  }
-</style>
+
 <script is:inline>
-"use strict";(()=>{(()=>{let t="theme-toggle";function o(){return window.matchMedia("(prefers-color-scheme: dark)").matches?"dark":"light"}function l(){let e=localStorage.getItem(t);return e==="dark"||e==="light"?e:null}function n(){return l()||o()}function c(e){e===o()?localStorage.removeItem(t):localStorage.setItem(t,e)}function s(e){let m=document.documentElement;m.classList.toggle("dark",e==="dark"),m.style.colorScheme=e}function r(e){c(e),s(e)}r(n()),window.astroThemeToggle={setTheme:r,getTheme:n}})();})();
+"use strict";(()=>{(()=>{let t="theme-toggle";function o(){return window.matchMedia("(prefers-color-scheme: dark)").matches?"dark":"light"}function c(){let e=localStorage.getItem(t);return e==="dark"||e==="light"?e:null}function n(){return c()||o()}function l(e){e===o()?localStorage.removeItem(t):localStorage.setItem(t,e)}function a(e){let s=document.documentElement;s.classList.toggle("dark",e==="dark"),s.style.colorScheme=e}function r(e){l(e),a(e)}function m(){r(n())}m(),document.addEventListener("astro:after-swap",m),window.astroThemeToggle={setTheme:r,getTheme:n}})();})();
 </script>
diff --git a/lib/theme-script.ts b/lib/theme-script.ts
index 7f2db44..4e6a535 100644
--- a/lib/theme-script.ts
+++ b/lib/theme-script.ts
@@ -37,8 +37,15 @@
     setStyle(theme)
   }
 
+  function setupTheme() {
+    setTheme(getTheme())
+  }
+
   // Set the theme on load
-  setTheme(getTheme())
+  setupTheme()
+
+  // Set the theme after a page swap
+  document.addEventListener('astro:after-swap', setupTheme)
 
   window.astroThemeToggle = { setTheme, getTheme }
 })()
diff --git a/lib/theme-style.astro b/lib/theme-style.astro
deleted file mode 100644
index 2a7806f..0000000
--- a/lib/theme-style.astro
+++ /dev/null
@@ -1,7 +0,0 @@
-<style is:global>
-  ::view-transition-old(root),
-  ::view-transition-new(root) {
-    animation: none;
-    mix-blend-mode: normal;
-  }
-</style>
diff --git a/website/components/head.astro b/website/components/head.astro
index 56646f5..1f00e04 100644
--- a/website/components/head.astro
+++ b/website/components/head.astro
@@ -1,5 +1,6 @@
 ---
 import { ThemeScript } from 'astro-theme-toggle'
+import { ViewTransitions } from 'astro:transitions'
 ---
 
 <head>
@@ -7,5 +8,6 @@ import { ThemeScript } from 'astro-theme-toggle'
   <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width" />
+  <ViewTransitions />
   <ThemeScript />
 </head>
diff --git a/website/components/theme-toggle-button.astro b/website/components/theme-toggle-button.astro
index 3605bbf..4d8fc9f 100644
--- a/website/components/theme-toggle-button.astro
+++ b/website/components/theme-toggle-button.astro
@@ -11,7 +11,11 @@ import IconMoonSvg from './icon-moon-svg.astro'
 
 <script>
   import { handleToggleClick } from 'astro-theme-toggle'
-  document
-    .getElementById('theme-toggle')
-    ?.addEventListener('click', handleToggleClick)
+  const addListener = () => {
+    document
+      .getElementById('theme-toggle')
+      ?.addEventListener('click', handleToggleClick)
+  }
+  addListener()
+  document.addEventListener('astro:after-swap', addListener)
 </script>