diff --git a/src/components/handbook-navigation.svelte b/src/components/handbook-navigation.svelte
index 17d6bf6b..d3dcd1bd 100644
--- a/src/components/handbook-navigation.svelte
+++ b/src/components/handbook-navigation.svelte
@@ -31,7 +31,7 @@
 
       <div class="items-center gap-1 text-sm font-medium leading-relaxed hidden lg:flex">
         <Icon icon="home" />
-        <Link href={sanitizeSlug('/')}>
+        <Link href={sanitizeSlug('/')} target="_blank" rel="noopener noreferrer">
           {t('handbook.navigation.website')}
         </Link>
       </div>
diff --git a/src/components/page-drawer.svelte b/src/components/page-drawer.svelte
index 9e8d362e..436cdc24 100644
--- a/src/components/page-drawer.svelte
+++ b/src/components/page-drawer.svelte
@@ -48,7 +48,7 @@
       <Button class="bg-background" variant="ghost" icon="close" on:click={drawer.close} />
     </header>
     <div>
-      {#if !$page.url.pathname.includes('handbook')}
+      {#if !$drawer.includes('handbook/')}
         {#await fetchPage({ slug: $drawer, version: $page.data.version || 'published' })}
           <div class="flex justify-center p-10">
             <Spinner size="md" />