diff --git a/packages/ui/src/header/helper.tsx b/packages/ui/src/header/helper.tsx
index bb6bbf1cc84..b6d76f8c6d6 100644
--- a/packages/ui/src/header/helper.tsx
+++ b/packages/ui/src/header/helper.tsx
@@ -10,8 +10,8 @@ export interface IHeaderProperties {
 }
 export const headerStyle: IHeaderProperties = {
   [EHeaderVariant.PRIMARY]:
-    "relative flex w-full flex-shrink-0 flex-row items-center justify-between gap-x-2 gap-y-4 bg-custom-sidebar-background-100",
-  [EHeaderVariant.SECONDARY]: "!py-0  overflow-y-hidden border-b border-custom-border-200 justify-between",
+    "relative flex w-full flex-shrink-0 flex-row items-center justify-between gap-x-2 gap-y-4 bg-custom-sidebar-background-100 bg-custom-background-100 z-[18]",
+  [EHeaderVariant.SECONDARY]: "!py-0  overflow-y-hidden border-b border-custom-border-200 justify-between bg-custom-background-100 z-[15]",
   [EHeaderVariant.TERNARY]: "flex flex-wrap justify-between py-2  border-b border-custom-border-200 gap-2 bg-custom-background-100 z-[12]",
 };
 export const minHeights: IHeaderProperties = {
diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/draft-issues/page.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/draft-issues/page.tsx
index 6268823d0cc..924b830cff8 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/draft-issues/page.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/draft-issues/page.tsx
@@ -23,7 +23,7 @@ const ProjectDraftIssuesPage = observer(() => {
     <>
       <PageHead title={pageTitle} />
       <div className="flex h-full w-full flex-col">
-        <div className="gap-1 flex items-center border-b border-custom-border-200 px-4 py-2.5 shadow-sm">
+        <div className="gap-1 flex items-center border-b border-custom-border-200 px-4 py-2.5 shadow-sm bg-custom-background-100 z-[12]">
           <button
             type="button"
             onClick={() => router.push(`/${workspaceSlug}/projects/${projectId}/issues/`)}
diff --git a/web/core/components/core/app-header.tsx b/web/core/components/core/app-header.tsx
index 6003186776e..6b943044e93 100644
--- a/web/core/components/core/app-header.tsx
+++ b/web/core/components/core/app-header.tsx
@@ -14,8 +14,8 @@ export const AppHeader = (props: AppHeaderProps) => {
   const { header, mobileHeader } = props;
 
   return (
-    <div className="z-[15]">
-      <Row className="h-[3.75rem] z-10 flex gap-2 w-full items-center border-b border-custom-border-200 bg-custom-sidebar-background-100">
+    <div className="z-[18]">
+      <Row className="h-[3.75rem] flex gap-2 w-full items-center border-b border-custom-border-200 bg-custom-sidebar-background-100">
         <div className="block bg-custom-sidebar-background-100 md:hidden">
           <SidebarHamburgerToggle />
         </div>
diff --git a/web/core/components/inbox/content/inbox-issue-header.tsx b/web/core/components/inbox/content/inbox-issue-header.tsx
index 0f6fe360029..efd0e8ee1e3 100644
--- a/web/core/components/inbox/content/inbox-issue-header.tsx
+++ b/web/core/components/inbox/content/inbox-issue-header.tsx
@@ -247,7 +247,7 @@ export const InboxIssueActionsHeader: FC<TInboxIssueActionsHeader> = observer((p
         />
       </>
 
-      <Row className="hidden relative lg:flex h-full w-full items-center justify-between gap-2">
+      <Row className="hidden relative lg:flex h-full w-full items-center justify-between gap-2 bg-custom-background-100 z-[15] border-b border-custom-border-200">
         <div className="flex items-center gap-4">
           {isNotificationEmbed && (
             <button onClick={embedRemoveCurrentNotification}>
diff --git a/web/core/components/inbox/content/inbox-issue-mobile-header.tsx b/web/core/components/inbox/content/inbox-issue-mobile-header.tsx
index d925c4613a8..e87573e9be0 100644
--- a/web/core/components/inbox/content/inbox-issue-mobile-header.tsx
+++ b/web/core/components/inbox/content/inbox-issue-mobile-header.tsx
@@ -83,7 +83,7 @@ export const InboxIssueActionsMobileHeader: React.FC<Props> = observer((props) =
     <Header variant={EHeaderVariant.SECONDARY} className="justify-start">
       {isNotificationEmbed && (
         <button onClick={embedRemoveCurrentNotification}>
-          <MoveRight className="h-4 w-4 text-custom-text-300 hover:text-custom-text-200" />
+          <MoveRight className="h-4 w-4 text-custom-text-300 hover:text-custom-text-200 mr-2" />
         </button>
       )}
       <PanelLeft
@@ -93,7 +93,7 @@ export const InboxIssueActionsMobileHeader: React.FC<Props> = observer((props) =
           isMobileSidebar ? "text-custom-primary-100" : "text-custom-text-200"
         )}
       />
-      <div className="flex items-center gap-2 w-full">
+      <div className="flex items-center gap-2 w-full bg-custom-background-100 z-[15]">
         <div className="flex items-center gap-x-2">
           <button
             type="button"
diff --git a/web/core/components/inbox/content/root.tsx b/web/core/components/inbox/content/root.tsx
index 92661ce2646..852be8a80b8 100644
--- a/web/core/components/inbox/content/root.tsx
+++ b/web/core/components/inbox/content/root.tsx
@@ -77,7 +77,7 @@ export const InboxContentRoot: FC<TInboxContentRoot> = observer((props) => {
   return (
     <>
       <div className="w-full h-full overflow-hidden relative flex flex-col">
-        <div className="flex-shrink-0 min-h-[50px] border-b border-custom-border-300">
+        <div className="flex-shrink-0 min-h-[52px] z-[11]">
           <InboxIssueActionsHeader
             setIsMobileSidebar={setIsMobileSidebar}
             isMobileSidebar={isMobileSidebar}