diff --git a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(detail)/layout.tsx b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(detail)/layout.tsx
index 37f4a7749a..d2ccb109ba 100644
--- a/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(detail)/layout.tsx
+++ b/web/app/[workspaceSlug]/(projects)/projects/(detail)/[projectId]/issues/(detail)/layout.tsx
@@ -8,7 +8,7 @@ export default function ProjectIssueDetailsLayout({ children }: { children: Reac
   return (
     <>
       <AppHeader header={<ProjectIssueDetailsHeader />} />
-      <ContentWrapper>{children}</ContentWrapper>
+      <ContentWrapper className="overflow-hidden">{children}</ContentWrapper>
     </>
   );
 }
diff --git a/web/core/components/core/content-wrapper.tsx b/web/core/components/core/content-wrapper.tsx
index f952399675..eefc96b1e0 100644
--- a/web/core/components/core/content-wrapper.tsx
+++ b/web/core/components/core/content-wrapper.tsx
@@ -1,13 +1,16 @@
 "use client";
 
 import { ReactNode } from "react";
+// helpers
+import { cn } from "@/helpers/common.helper";
 
 export interface ContentWrapperProps {
+  className?: string;
   children: ReactNode;
 }
 
-export const ContentWrapper = ({ children }: ContentWrapperProps) => (
+export const ContentWrapper = ({ className, children }: ContentWrapperProps) => (
   <div className="h-full w-full overflow-hidden">
-    <div className="relative h-full w-full overflow-x-hidden overflow-y-scroll">{children}</div>
+    <div className={cn("relative h-full w-full overflow-x-hidden overflow-y-scroll", className)}>{children}</div>
   </div>
 );
diff --git a/web/core/components/issues/issue-detail/root.tsx b/web/core/components/issues/issue-detail/root.tsx
index 9db4b1ab9e..a5363e78ca 100644
--- a/web/core/components/issues/issue-detail/root.tsx
+++ b/web/core/components/issues/issue-detail/root.tsx
@@ -360,7 +360,7 @@ export const IssueDetailRoot: FC<TIssueDetailRoot> = observer((props) => {
             />
           </div>
           <div
-            className="fixed right-0 z-[5] h-full w-full min-w-[300px] overflow-hidden border-l border-custom-border-200 bg-custom-sidebar-background-100 pb-5 sm:w-1/2 md:relative md:w-1/3 lg:min-w-80 xl:min-w-96"
+            className="fixed right-0 z-[5] h-full w-full min-w-[300px] overflow-hidden border-l border-custom-border-200 bg-custom-sidebar-background-100 py-5 sm:w-1/2 md:relative md:w-1/3 lg:min-w-80 xl:min-w-96"
             style={issueDetailSidebarCollapsed ? { right: `-${window?.innerWidth || 0}px` } : {}}
           >
             <IssueDetailsSidebar