diff --git a/apps/v4/components/docs-base-switcher.tsx b/apps/v4/components/docs-base-switcher.tsx
index 90f923451e..e8c3487341 100644
--- a/apps/v4/components/docs-base-switcher.tsx
+++ b/apps/v4/components/docs-base-switcher.tsx
@@ -12,8 +12,10 @@ export function DocsBaseSwitcher({
   component: string
   className?: string
 }) {
+  const activeBase = BASES.find((baseItem) => base === baseItem.name)
+
   return (
-    <div className={cn("inline-flex items-center gap-6", className)}>
+    <div className={cn("inline-flex w-full items-center gap-6", className)}>
       {BASES.map((baseItem) => (
         <Link
           key={baseItem.name}
@@ -24,6 +26,14 @@ export function DocsBaseSwitcher({
           {baseItem.title}
         </Link>
       ))}
+      {activeBase?.meta?.logo && (
+        <div
+          className="text-muted-foreground ml-auto size-4 shrink-0 opacity-80 [&_svg]:size-4"
+          dangerouslySetInnerHTML={{
+            __html: activeBase.meta.logo,
+          }}
+        />
+      )}
     </div>
   )
 }
diff --git a/apps/v4/components/docs-sidebar.tsx b/apps/v4/components/docs-sidebar.tsx
index c4a64ed2f8..e944be29ee 100644
--- a/apps/v4/components/docs-sidebar.tsx
+++ b/apps/v4/components/docs-sidebar.tsx
@@ -61,7 +61,7 @@ export function DocsSidebar({
 
   return (
     <Sidebar
-      className="sticky top-[calc(var(--header-height)+1px)] z-30 hidden h-[calc(100svh-var(--footer-height)-4rem)] overscroll-none bg-transparent lg:flex"
+      className="sticky top-[calc(var(--header-height)+1px)] z-30 hidden h-[calc(100svh-6rem)] overscroll-none bg-transparent lg:flex"
       collapsible="none"
       {...props}
     >