diff --git a/src/client/app/router.ts b/src/client/app/router.ts
index 023a1803..42f12021 100644
--- a/src/client/app/router.ts
+++ b/src/client/app/router.ts
@@ -290,7 +290,7 @@ function handleHMR(route: Route): void {
   // update route.data on HMR updates of active page
   if (import.meta.hot) {
     // hot reload pageData
-    import.meta.hot!.on('vitepress:pageData', (payload: PageDataPayload) => {
+    import.meta.hot.on('vitepress:pageData', (payload: PageDataPayload) => {
       if (shouldHotReload(payload)) {
         route.data = payload.pageData
       }
diff --git a/src/client/theme-default/components/VPLocalSearchBox.vue b/src/client/theme-default/components/VPLocalSearchBox.vue
index 75f073bb..29671e84 100644
--- a/src/client/theme-default/components/VPLocalSearchBox.vue
+++ b/src/client/theme-default/components/VPLocalSearchBox.vue
@@ -194,7 +194,7 @@ debouncedWatch(
         ?.scrollIntoView({ block: 'center' })
     }
     // FIXME: without this whole page scrolls to the bottom
-    el.value?.querySelector('.result')?.scrollIntoView({ block: 'start' })
+    resultsEl.value?.firstElementChild?.scrollIntoView({ block: 'start' })
   },
   { debounce: 200, immediate: true }
 )