diff --git a/packages/gitbook/src/components/SpaceLayout/SpaceLayout.tsx b/packages/gitbook/src/components/SpaceLayout/SpaceLayout.tsx
index d69987024..650684ceb 100644
--- a/packages/gitbook/src/components/SpaceLayout/SpaceLayout.tsx
+++ b/packages/gitbook/src/components/SpaceLayout/SpaceLayout.tsx
@@ -149,6 +149,7 @@ export function SpaceLayout(props: {
                                                                 'page-no-toc:hidden',
                                                                 'site-header-none:page-no-toc:flex'
                                                             )}
+                                                            withPortal={false}
                                                         />
                                                     )}
                                                 </>
diff --git a/packages/gitbook/src/components/TableOfContents/TOCScrollContent.tsx b/packages/gitbook/src/components/TableOfContents/TOCScrollContent.tsx
index ba143f694..e32cafad8 100644
--- a/packages/gitbook/src/components/TableOfContents/TOCScrollContent.tsx
+++ b/packages/gitbook/src/components/TableOfContents/TOCScrollContent.tsx
@@ -35,7 +35,7 @@ export async function TOCScrollContent(props: {
             )}
         >
             {!!innerHeader && (
-                <div className="inline-flex w-full flex-col gap-4 px-2 max-lg:pt-2 max-lg:pr-12 lg:pr-4 lg:first:mt-4">
+                <div className="inline-flex w-full flex-col gap-4 px-2 max-lg:pt-2 max-lg:pr-14 max-lg:pb-2 lg:pr-4 lg:first:mt-4">
                     {innerHeader}
                 </div>
             )}
@@ -43,7 +43,7 @@ export async function TOCScrollContent(props: {
             <TOCScrollContainer // The scrollview inside the sidebar
                 className={tcls(
                     'flex flex-grow flex-col p-2',
-                    innerHeader ? 'mt-0 lg:mt-2' : 'mt-8 lg:mt-0',
+                    innerHeader ? 'mt-0 lg:mt-4' : 'mt-8 lg:mt-0',
                     customization.trademark.enabled && 'pb-[4.5rem]',
                     'gutter-stable overflow-y-auto',
                     '[&::-webkit-scrollbar]:bg-transparent',
diff --git a/packages/gitbook/src/components/TableOfContents/TableOfContents.tsx b/packages/gitbook/src/components/TableOfContents/TableOfContents.tsx
index e8e6115ef..2e507b939 100644
--- a/packages/gitbook/src/components/TableOfContents/TableOfContents.tsx
+++ b/packages/gitbook/src/components/TableOfContents/TableOfContents.tsx
@@ -108,7 +108,7 @@ export function TableOfContents(props: {
                         iconOnly
                         size="medium"
                         autoFocus={false}
-                        className="absolute top-2 right-2 z-50 aspect-square bg-transparent text-tint opacity-8 shadow-none ring-transparent lg:hidden"
+                        className="absolute top-2 right-2 z-50 aspect-square size-[calc(2.25rem+1px)] justify-center bg-transparent text-tint opacity-8 shadow-none ring-transparent lg:hidden"
                         onClick={() => setOpen(false)}
                     >
                         <span className="sr-only">Close</span>