diff --git a/src/app/dashboard/[teamIdOrSlug]/sandboxes/[sandboxId]/inspect/page.tsx b/src/app/dashboard/[teamIdOrSlug]/sandboxes/[sandboxId]/inspect/page.tsx
index 8121a7a32..301095429 100644
--- a/src/app/dashboard/[teamIdOrSlug]/sandboxes/[sandboxId]/inspect/page.tsx
+++ b/src/app/dashboard/[teamIdOrSlug]/sandboxes/[sandboxId]/inspect/page.tsx
@@ -2,7 +2,6 @@ import { COOKIE_KEYS } from '@/configs/keys'
 import { SandboxInspectProvider } from '@/features/dashboard/sandbox/inspect/context'
 import SandboxInspectFilesystem from '@/features/dashboard/sandbox/inspect/filesystem'
 import SandboxInspectViewer from '@/features/dashboard/sandbox/inspect/viewer'
-import { cn } from '@/lib/utils'
 import { resolveTeamIdInServerComponent } from '@/lib/utils/server'
 import { getSandboxRoot } from '@/server/sandboxes/get-sandbox-root'
 import ClientOnly from '@/ui/client-only'
@@ -40,12 +39,7 @@ export default async function SandboxInspectPage({
       rootPath={rootPath}
       seedEntries={res?.data?.entries ?? []}
     >
-      <ClientOnly
-        className={cn(
-          'flex flex-1 gap-4 overflow-hidden p-3 md:p-6',
-          'max-md:sticky max-md:top-0 max-md:min-h-[calc(100vh-var(--protected-navbar-height))]'
-        )}
-      >
+      <ClientOnly className="max-md:absolute max-md:inset-0 flex flex-1 gap-4 overflow-hidden p-3 md:p-6">
         <SandboxInspectFilesystem rootPath={rootPath} />
         <SandboxInspectViewer />
       </ClientOnly>
diff --git a/src/features/dashboard/sandbox/inspect/incompatible.tsx b/src/features/dashboard/sandbox/inspect/incompatible.tsx
index 32a3d6a9a..7e1b0dec3 100644
--- a/src/features/dashboard/sandbox/inspect/incompatible.tsx
+++ b/src/features/dashboard/sandbox/inspect/incompatible.tsx
@@ -38,10 +38,10 @@ export default function SandboxInspectIncompatible({
       team_id: teamIdOrSlug,
       template_name_or_id: templateNameOrId,
     })
-  }, [trackInteraction, teamIdOrSlug])
+  }, [trackInteraction, teamIdOrSlug, templateNameOrId])
 
   return (
-    <div className="flex h-full w-full flex-col items-center justify-center p-4 md:justify-center">
+    <div className="flex flex-1 min-h-0 max-md:absolute max-md:inset-0 w-full max-md: flex-col items-center justify-center p-4 md:justify-center">
       <div className="text-fill-highlight pointer-events-none absolute -top-30 -right-100 -z-10 flex overflow-hidden">
         <AsciiBackgroundPattern className="w-1/2" />
         <AsciiBackgroundPattern className="mi w-1/2 -scale-x-100" />
diff --git a/src/features/dashboard/sandbox/layout.tsx b/src/features/dashboard/sandbox/layout.tsx
index 68f94cf6d..08b518e71 100644
--- a/src/features/dashboard/sandbox/layout.tsx
+++ b/src/features/dashboard/sandbox/layout.tsx
@@ -33,14 +33,18 @@ export default function SandboxLayout({
   }
 
   return (
-    <div className="flex max-h-svh h-full min-h-0 flex-1 flex-col max-md:overflow-y-auto">
+    <div className="flex max-h-svh h-full min-h-0 flex-1 flex-col max-md:h-auto max-md:min-h-svh max-md:overflow-y-auto">
       {header}
 
-      <DashboardTabs type="path" layoutKey="tabs-indicator-sandbox">
+      <DashboardTabs
+        type="path"
+        layoutKey="tabs-indicator-sandbox"
+        className="max-md:sticky max-md:top-0 max-md:z-20 max-md:bg-bg max-md:min-h-svh"
+      >
         <DashboardTab
           id="inspect"
           label="Inspect"
-          className="flex flex-col max-h-full"
+          className="flex flex-col max-h-full relative"
         >
           {isEnvdVersionCompatibleForInspect ? (
             children
diff --git a/src/ui/dashboard-tabs.tsx b/src/ui/dashboard-tabs.tsx
index 306bcbffb..6dfa83d6f 100644
--- a/src/ui/dashboard-tabs.tsx
+++ b/src/ui/dashboard-tabs.tsx
@@ -74,7 +74,7 @@ function DashboardTabsComponent({
             className="w-fit flex-none"
             asChild
           >
-            <Link href={tab.href} prefetch>
+            <Link href={tab.href}>
               {tab.icon}
               {tab.label}
             </Link>