diff --git a/.changeset/few-bobcats-bake.md b/.changeset/few-bobcats-bake.md
new file mode 100644
index 000000000..25a61d71d
--- /dev/null
+++ b/.changeset/few-bobcats-bake.md
@@ -0,0 +1,5 @@
+---
+"gitbook": patch
+---
+
+Small fixes to search modal
diff --git a/packages/gitbook/src/components/Search/SearchContainer.tsx b/packages/gitbook/src/components/Search/SearchContainer.tsx
index 1be635720..1a28faf25 100644
--- a/packages/gitbook/src/components/Search/SearchContainer.tsx
+++ b/packages/gitbook/src/components/Search/SearchContainer.tsx
@@ -150,7 +150,7 @@ export function SearchContainer(props: SearchContainerProps) {
             <Popover
                 content={
                     // Only show content if there's a query or Ask is enabled
-                    state?.query || withSearchAI ? (
+                    state?.query || withAI ? (
                         <React.Suspense fallback={null}>
                             {isMultiVariants && !showAsk ? (
                                 <SearchScopeToggle spaceTitle={spaceTitle} />
@@ -170,7 +170,7 @@ export function SearchContainer(props: SearchContainerProps) {
                 rootProps={{
                     open: state?.open ?? false,
                     onOpenChange: (open) => {
-                        setSearchState((prev) => (prev ? { ...prev, open } : null));
+                        open ? onOpen() : onClose();
                     },
                     modal: isMobile,
                 }}