diff --git a/src/components/Search/SearchModal.tsx b/src/components/Search/SearchModal.tsx
index 50f91f4caf..6f6bf80eff 100644
--- a/src/components/Search/SearchModal.tsx
+++ b/src/components/Search/SearchModal.tsx
@@ -246,6 +246,7 @@ function SearchModalBody(
                             global: state.global,
                         });
                     }}
+                    onClose={onClose}
                 >
                     {parent && state.query ? <SearchScopeToggle spaceTitle={spaceTitle} /> : null}
                 </SearchResults>
diff --git a/src/components/Search/SearchPageResultItem.tsx b/src/components/Search/SearchPageResultItem.tsx
index af0525c46b..82bed0abda 100644
--- a/src/components/Search/SearchPageResultItem.tsx
+++ b/src/components/Search/SearchPageResultItem.tsx
@@ -11,15 +11,24 @@ export const SearchPageResultItem = React.forwardRef(function SearchPageResultIt
         query: string;
         item: ComputedPageResult;
         active: boolean;
+        onClick?: (to: string) => void;
     },
     ref: React.Ref<HTMLAnchorElement>,
 ) {
-    const { query, item, active } = props;
+    const { query, item, active, onClick } = props;
 
     return (
         <Link
             ref={ref}
             href={item.href}
+            onClick={(event) => {
+                if (!onClick) {
+                    return true;
+                }
+
+                event.preventDefault();
+                onClick(item.href);
+            }}
             className={tcls(
                 'flex',
                 'flex-row',
diff --git a/src/components/Search/SearchResults.tsx b/src/components/Search/SearchResults.tsx
index 113a390b07..779ec20c7d 100644
--- a/src/components/Search/SearchResults.tsx
+++ b/src/components/Search/SearchResults.tsx
@@ -43,10 +43,11 @@ export const SearchResults = React.forwardRef(function SearchResults(
         parent: Site | Collection | null;
         withAsk: boolean;
         onSwitchToAsk: () => void;
+        onClose: (to?: string) => void;
     },
     ref: React.Ref<SearchResultsRef>,
 ) {
-    const { children, query, spaceId, revisionId, parent, withAsk, onSwitchToAsk } = props;
+    const { children, query, spaceId, revisionId, parent, withAsk, onSwitchToAsk, onClose } = props;
 
     const language = useLanguage();
     const debounceTimeout = React.useRef<NodeJS.Timeout | null>(null);
@@ -210,6 +211,7 @@ export const SearchResults = React.forwardRef(function SearchResults(
                                         query={query}
                                         item={item}
                                         active={index === cursor}
+                                        onClick={parent ? undefined : onClose}
                                     />
                                 );
                             }
@@ -250,6 +252,7 @@ export const SearchResults = React.forwardRef(function SearchResults(
                                         query={query}
                                         item={item}
                                         active={index === cursor}
+                                        onClick={parent ? undefined : onClose}
                                     />
                                 );
                             }
diff --git a/src/components/Search/SearchSectionResultItem.tsx b/src/components/Search/SearchSectionResultItem.tsx
index b620a7651f..f2014728f8 100644
--- a/src/components/Search/SearchSectionResultItem.tsx
+++ b/src/components/Search/SearchSectionResultItem.tsx
@@ -11,15 +11,24 @@ export const SearchSectionResultItem = React.forwardRef(function SearchSectionRe
         query: string;
         item: ComputedSectionResult;
         active: boolean;
+        onClick?: (to: string) => void;
     },
     ref: React.Ref<HTMLAnchorElement>,
 ) {
-    const { query, item, active } = props;
+    const { query, item, active, onClick } = props;
 
     return (
         <Link
             ref={ref}
             href={item.href}
+            onClick={(event) => {
+                if (!onClick) {
+                    return true;
+                }
+
+                event.preventDefault();
+                onClick(item.href);
+            }}
             className={tcls(
                 'search-section-result-item',
                 '[&:has(+:not(&))]:mb-6',