From 72d6fcb3717c807005d24126183ccd87206eb5ac Mon Sep 17 00:00:00 2001
From: Eesh Midha <eeshmidha80@gmail.com>
Date: Tue, 27 Jan 2026 02:43:34 +0530
Subject: [PATCH] fix: remove sticky positioning from page headers in pages on
 scroll (#27242)

* fix: remove sticky positioning from page headers in pages using ShellMain

* correct fix (mostly)

* fix: disable sticky headers on routing forms and members pages

Applied disableSticky={true} to remaining affected pages:
- Routing Forms page
- Organization Members view
- Platform Members view

---------

Co-authored-by: Dhairyashil <dhairyashil10101010@gmail.com>
---
 .../apps/routing-forms/forms/[[...pages]]/Forms.tsx         | 1 +
 .../organizations/(org-user-only)/[id]/members/layout.tsx   | 1 +
 .../(use-page-wrapper)/settings/platform/members/layout.tsx | 1 +
 apps/web/modules/ee/workflows/views/WorkflowsPage.tsx       | 1 +
 apps/web/modules/shell/Shell.tsx                            | 6 ++++--
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/[[...pages]]/Forms.tsx b/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/[[...pages]]/Forms.tsx
index d60500e9dc..bbb702400c 100644
--- a/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/[[...pages]]/Forms.tsx
+++ b/apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/[[...pages]]/Forms.tsx
@@ -149,6 +149,7 @@ export default function RoutingForms({ appUrl }: { appUrl: string }) {
   return (
     <LicenseRequired>
       <ShellMain
+        disableSticky={true}
         heading={t("routing")}
         CTA={
           hasPaidPlan && forms?.length ? (
diff --git a/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/[id]/members/layout.tsx b/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/[id]/members/layout.tsx
index eef834cf8b..3ca093d60e 100644
--- a/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/[id]/members/layout.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/organizations/(org-user-only)/[id]/members/layout.tsx
@@ -10,6 +10,7 @@ export default async function Layout({ children }: { children: React.ReactNode }
   return (
     <Shell
       withoutMain={false}
+      disableSticky={true}
       heading={t("organization_members")}
       subtitle={t("organization_description")}
       headerClassName="hidden md:block"
diff --git a/apps/web/app/(use-page-wrapper)/settings/platform/members/layout.tsx b/apps/web/app/(use-page-wrapper)/settings/platform/members/layout.tsx
index 94dc169f9f..0f880c807d 100644
--- a/apps/web/app/(use-page-wrapper)/settings/platform/members/layout.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/platform/members/layout.tsx
@@ -23,6 +23,7 @@ export default async function Layout({ children }: { children: React.ReactNode }
           />
         </div>
       }
+      disableSticky={true}
       title={t("platform_members")}
       subtitle={t("platform_members_description")}
       withoutMain={false}
diff --git a/apps/web/modules/ee/workflows/views/WorkflowsPage.tsx b/apps/web/modules/ee/workflows/views/WorkflowsPage.tsx
index 78841ddc98..67eadcee7f 100644
--- a/apps/web/modules/ee/workflows/views/WorkflowsPage.tsx
+++ b/apps/web/modules/ee/workflows/views/WorkflowsPage.tsx
@@ -56,6 +56,7 @@ function WorkflowsPage({ filteredList }: PageProps) {
     <Shell withoutMain>
       <LicenseRequired>
         <ShellMain
+          disableSticky={true}
           heading={t("workflows")}
           subtitle={t("workflows_to_automate_notifications")}
           title={t("workflows")}
diff --git a/apps/web/modules/shell/Shell.tsx b/apps/web/modules/shell/Shell.tsx
index 74c54a00c5..f861cb3df7 100644
--- a/apps/web/modules/shell/Shell.tsx
+++ b/apps/web/modules/shell/Shell.tsx
@@ -87,6 +87,7 @@ export type LayoutProps = {
   afterHeading?: ReactNode;
   smallHeading?: boolean;
   isPlatformUser?: boolean;
+  disableSticky?: boolean;
 };
 
 const KBarWrapper = ({ children, withKBar = false }: { withKBar: boolean; children: React.ReactNode }) =>
@@ -132,8 +133,9 @@ export function ShellMain(props: LayoutProps) {
       {(props.heading || !!props.backPath) && (
         <div
           className={classNames(
-            "bg-default sticky top-0 z-10 mb-0 flex items-center md:mb-6 md:mt-0",
-            props.smallHeading ? "lg:mb-7" : "lg:mb-8"
+            "bg-default mb-0 flex items-center md:mb-6 md:mt-0",
+            props.smallHeading ? "lg:mb-7" : "lg:mb-8",
+            !props.disableSticky && "sticky top-0 z-10"
           )}>
           {!!props.backPath && (
             <Button