diff --git a/src/components/DropdownMenu/DropdownMenu.tsx b/src/components/DropdownMenu/DropdownMenu.tsx
index 46fb572..fb9c4f7 100644
--- a/src/components/DropdownMenu/DropdownMenu.tsx
+++ b/src/components/DropdownMenu/DropdownMenu.tsx
@@ -47,7 +47,7 @@ const DropdownMenuSubContent = React.forwardRef<
   <DropdownMenuPrimitive.SubContent
     ref={ref}
     className={cn(
-      `z-50 min-w-[8rem] overflow-hidden rounded-md border-2 border-primary bg-white
+      `z-40 min-w-[8rem] overflow-hidden rounded-md border-2 border-primary bg-white
       p-1 text-popover-foreground shadow-lg data-[state=open]:animate-in data-[state=closed]:animate-out
       data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95
       data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2
@@ -69,7 +69,7 @@ const DropdownMenuContent = React.forwardRef<
       ref={ref}
       sideOffset={sideOffset}
       className={cn(
-        `z-50 min-w-[8rem] overflow-hidden rounded-md border-2 border-primary
+        `z-40 min-w-[8rem] overflow-hidden rounded-md border-2 border-primary
         bg-white p-1 text-popover-foreground shadow-md`,
         `data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0
         data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95
diff --git a/src/components/Menubar/Menubar.tsx b/src/components/Menubar/Menubar.tsx
index aaef498..4abc5b6 100644
--- a/src/components/Menubar/Menubar.tsx
+++ b/src/components/Menubar/Menubar.tsx
@@ -77,7 +77,7 @@ const MenubarSubContent = React.forwardRef<
   <MenubarPrimitive.SubContent
     ref={ref}
     className={cn(
-      `z-50 min-w-[8rem] overflow-hidden rounded-md border-2 border-primary bg-white
+      `z-40 min-w-[8rem] overflow-hidden rounded-md border-2 border-primary bg-white
       p-1 text-popover-foreground shadow-lg data-[state=open]:animate-in data-[state=closed]:animate-out
       data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95
       data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2
@@ -104,7 +104,7 @@ const MenubarContent = React.forwardRef<
         alignOffset={alignOffset}
         sideOffset={sideOffset}
         className={cn(
-          `z-50 min-w-[12rem] overflow-hidden rounded-md border-2 border-primary
+          `z-40 min-w-[12rem] overflow-hidden rounded-md border-2 border-primary
           bg-white p-1 text-popover-foreground shadow-md data-[state=open]:animate-in
           data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95
           data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2
diff --git a/src/components/PopupModal/PopupModal.tsx b/src/components/PopupModal/PopupModal.tsx
index f6c5866..f817be0 100644
--- a/src/components/PopupModal/PopupModal.tsx
+++ b/src/components/PopupModal/PopupModal.tsx
@@ -104,7 +104,7 @@ const PopupModal = forwardRef<HTMLDivElement, IPopupModalProps>(
       ...rest
     } = props;
     const [hidden, setHidden] = useState(status);
-    const fullModeClass = fullMode ? 'fixed top-0 left-0 right-0 z-30' : '';
+    const fullModeClass = fullMode ? 'fixed top-0 left-0 right-0 z-50' : 'z-50';
 
     useEffect(() => {
       handleOpen();
diff --git a/src/components/Tooltip/Tooltip.tsx b/src/components/Tooltip/Tooltip.tsx
index 2b08137..a3ee599 100644
--- a/src/components/Tooltip/Tooltip.tsx
+++ b/src/components/Tooltip/Tooltip.tsx
@@ -50,7 +50,7 @@ export function Tooltip(props: TooltipProps) {
       {clonedIcon}
       <span className="ml-2 text-neutral">{children}</span>
       <div
-        className={`w-fit z-10 absolute bg-tertiary p-3 rounded-md text-neutral opacity-0transition-opacity
+        className={`w-fit z-50 absolute bg-tertiary p-3 rounded-md text-neutral opacity-0transition-opacity
         duration-300 ${showTooltip ? 'opacity-90' : 'opacity-0'}
           ${customClass} ${placementClasses[placement]}`}
       >