diff --git a/src/components/buttons/ThemeToggle.astro b/src/components/buttons/ThemeToggle.astro
index c7c241e..5cfed72 100644
--- a/src/components/buttons/ThemeToggle.astro
+++ b/src/components/buttons/ThemeToggle.astro
@@ -43,10 +43,16 @@
 </button>
 
 <script is:inline>
-  const isDark =
-    localStorage.theme === 'dark' ||
-    (!('theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches);
-  document.documentElement.classList.toggle('dark', isDark);
+  const applyTheme = () => {
+    const isDark =
+      localStorage.theme === 'dark' ||
+      (!('theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches);
+    document.documentElement.classList.toggle('dark', isDark);
+  };
+
+  applyTheme();
+
+  document.addEventListener('astro:after-swap', applyTheme);
 </script>
 
 <script>