diff --git a/src/client/theme-default/Layout.vue b/src/client/theme-default/Layout.vue
index 3a7a64ec..30ebe491 100644
--- a/src/client/theme-default/Layout.vue
+++ b/src/client/theme-default/Layout.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
-import { useRoute } from 'vitepress'
-import { computed, provide, useSlots, watch } from 'vue'
+import { computed, provide, useSlots } from 'vue'
 import VPBackdrop from './components/VPBackdrop.vue'
 import VPContent from './components/VPContent.vue'
 import VPFooter from './components/VPFooter.vue'
@@ -9,7 +8,8 @@ import VPNav from './components/VPNav.vue'
 import VPSidebar from './components/VPSidebar.vue'
 import VPSkipLink from './components/VPSkipLink.vue'
 import { useData } from './composables/data'
-import { useCloseSidebarOnEscape, useSidebarControl } from './composables/sidebar'
+import { registerWatchers } from './composables/layout'
+import { useSidebarControl } from './composables/sidebar'
 
 const {
   isOpen: isSidebarOpen,
@@ -17,10 +17,7 @@ const {
   close: closeSidebar
 } = useSidebarControl()
 
-const route = useRoute()
-watch(() => route.path, closeSidebar)
-
-useCloseSidebarOnEscape(isSidebarOpen, closeSidebar)
+registerWatchers({ closeSidebar })
 
 const { frontmatter } = useData()
 
@@ -31,7 +28,11 @@ provide('hero-image-slot-exists', heroImageSlotExists)
 </script>
 
 <template>
-  <div v-if="frontmatter.layout !== false" class="Layout" :class="frontmatter.pageClass" >
+  <div
+    v-if="frontmatter.layout !== false"
+    class="Layout"
+    :class="frontmatter.pageClass"
+  >
     <slot name="layout-top" />
     <VPSkipLink />
     <VPBackdrop class="backdrop" :show="isSidebarOpen" @click="closeSidebar" />
diff --git a/src/client/theme-default/composables/layout.ts b/src/client/theme-default/composables/layout.ts
index 8ee93ed2..e2828807 100644
--- a/src/client/theme-default/composables/layout.ts
+++ b/src/client/theme-default/composables/layout.ts
@@ -1,10 +1,13 @@
 import { useMediaQuery } from '@vueuse/core'
-import { onContentUpdated } from 'vitepress'
-import { computed, shallowRef } from 'vue'
-import type { MenuItem } from '../../shared'
+import { onContentUpdated, useRoute } from 'vitepress'
+import { computed, shallowRef, watch } from 'vue'
+import { type MenuItem } from '../../shared'
 import { getSidebar, getSidebarGroups } from '../support/sidebar'
 import { useData } from './data'
 import { getHeaders } from './outline'
+import { useCloseSidebarOnEscape } from './sidebar'
+
+const headers = shallowRef<MenuItem[]>([])
 
 export function useLayout() {
   const { frontmatter, page, theme } = useData()
@@ -47,13 +50,6 @@ export function useLayout() {
       : frontmatter.value.aside === 'left'
   })
 
-  const headers = shallowRef<MenuItem[]>([])
-
-  // TODO: optimize this
-  onContentUpdated(() => {
-    headers.value = getHeaders(frontmatter.value.outline ?? theme.value.outline)
-  })
-
   const hasLocalNav = computed(() => {
     return headers.value.length > 0
   })
@@ -70,3 +66,20 @@ export function useLayout() {
     hasLocalNav
   }
 }
+
+interface RegisterWatchersOptions {
+  closeSidebar: () => void
+}
+
+export function registerWatchers({ closeSidebar }: RegisterWatchersOptions) {
+  const { frontmatter, theme } = useData()
+
+  onContentUpdated(() => {
+    headers.value = getHeaders(frontmatter.value.outline ?? theme.value.outline)
+  })
+
+  const route = useRoute()
+  watch(() => route.path, closeSidebar)
+
+  useCloseSidebarOnEscape(closeSidebar)
+}
diff --git a/src/client/theme-default/composables/sidebar.ts b/src/client/theme-default/composables/sidebar.ts
index 79d1073a..b693cc89 100644
--- a/src/client/theme-default/composables/sidebar.ts
+++ b/src/client/theme-default/composables/sidebar.ts
@@ -7,31 +7,19 @@ import {
   watch,
   watchEffect,
   watchPostEffect,
-  type ComputedRef,
-  type Ref
+  type ComputedRef
 } from 'vue'
 import { isActive } from '../../shared'
 import { hasActiveLink as containsActiveLink } from '../support/sidebar'
 import { useData } from './data'
 
-export interface SidebarControl {
-  collapsed: Ref<boolean>
-  collapsible: ComputedRef<boolean>
-  isLink: ComputedRef<boolean>
-  isActiveLink: Ref<boolean>
-  hasActiveLink: ComputedRef<boolean>
-  hasChildren: ComputedRef<boolean>
-  toggle(): void
-}
+const isOpen = ref(false)
 
 /**
  * a11y: cache the element that opened the Sidebar (the menu button) then
  * focus that button again when Menu is closed with Escape key.
  */
-export function useCloseSidebarOnEscape(
-  isOpen: Ref<boolean>,
-  close: () => void
-) {
+export function useCloseSidebarOnEscape(close: () => void) {
   let triggerElement: HTMLButtonElement | undefined
 
   watchEffect(() => {
@@ -57,8 +45,6 @@ export function useCloseSidebarOnEscape(
 }
 
 export function useSidebarControl() {
-  const isOpen = ref(false)
-
   function open() {
     isOpen.value = true
   }
@@ -81,7 +67,7 @@ export function useSidebarControl() {
 
 export function useSidebarItemControl(
   item: ComputedRef<DefaultTheme.SidebarItem>
-): SidebarControl {
+) {
   const { page, hash } = useData()
 
   const collapsed = ref(false)