diff --git a/plane-src/apps/web/core/components/dropdowns/cycle/cycle-options.tsx b/plane-src/apps/web/core/components/dropdowns/cycle/cycle-options.tsx
index a86b7a0..a52d71c 100644
--- a/plane-src/apps/web/core/components/dropdowns/cycle/cycle-options.tsx
+++ b/plane-src/apps/web/core/components/dropdowns/cycle/cycle-options.tsx
@@ -125,9 +125,9 @@ export const CycleOptions = observer(function CycleOptions(props: CycleOptionsPr
     query === "" ? options : options?.filter((o) => o.query.toLowerCase().includes(query.toLowerCase()));
 
   return (
-    <Combobox.Options className="fixed z-10" static>
+    <Combobox.Options data-prevent-outside-click className="nodedc-external-popup-anchor fixed z-[760]" static>
       <div
-        className="nodedc-dropdown-surface z-30 my-1 w-52"
+        className="nodedc-dropdown-surface nodedc-external-popup-anchor z-[760] my-1 w-52"
         ref={setPopperElement}
         style={styles.popper}
         {...attributes.popper}
diff --git a/plane-src/apps/web/core/components/dropdowns/estimate.tsx b/plane-src/apps/web/core/components/dropdowns/estimate.tsx
index e994e0f..1390be0 100644
--- a/plane-src/apps/web/core/components/dropdowns/estimate.tsx
+++ b/plane-src/apps/web/core/components/dropdowns/estimate.tsx
@@ -232,9 +232,9 @@ export const EstimateDropdown = observer(function EstimateDropdown(props: Props)
       renderByDefault={renderByDefault}
     >
       {isOpen && (
-        <Combobox.Options className="fixed z-10" static>
+        <Combobox.Options data-prevent-outside-click className="nodedc-external-popup-anchor fixed z-[760]" static>
           <div
-            className="nodedc-dropdown-surface z-30 my-1 w-52"
+            className="nodedc-dropdown-surface nodedc-external-popup-anchor z-[760] my-1 w-52"
             ref={setPopperElement}
             style={styles.popper}
             {...attributes.popper}
@@ -269,14 +269,11 @@ export const EstimateDropdown = observer(function EstimateDropdown(props: Props)
                         <Combobox.Option key={option.value} value={option.value}>
                           {({ active, selected }) => (
                             <div
-                              className={cn(
-                                "nodedc-dropdown-option",
-                                {
-                                  "bg-white/6": active,
-                                  "text-primary": selected,
-                                  "text-secondary": !selected,
-                                }
-                              )}
+                              className={cn("nodedc-dropdown-option", {
+                                "bg-white/6": active,
+                                "text-primary": selected,
+                                "text-secondary": !selected,
+                              })}
                             >
                               <span className="flex-grow truncate">{option.content}</span>
                               {selected && <CheckIcon className="h-3.5 w-3.5 flex-shrink-0" />}
diff --git a/plane-src/apps/web/core/components/dropdowns/module/module-options.tsx b/plane-src/apps/web/core/components/dropdowns/module/module-options.tsx
index f541ce0..0d4167e 100644
--- a/plane-src/apps/web/core/components/dropdowns/module/module-options.tsx
+++ b/plane-src/apps/web/core/components/dropdowns/module/module-options.tsx
@@ -113,9 +113,9 @@ export const ModuleOptions = observer(function ModuleOptions(props: Props) {
   );
 
   return (
-    <Combobox.Options className="fixed z-10" static>
+    <Combobox.Options data-prevent-outside-click className="nodedc-external-popup-anchor fixed z-[760]" static>
       <div
-        className="nodedc-dropdown-surface z-30 my-1 w-52"
+        className="nodedc-dropdown-surface nodedc-external-popup-anchor z-[760] my-1 w-52"
         ref={setPopperElement}
         style={styles.popper}
         {...attributes.popper}
@@ -141,14 +141,11 @@ export const ModuleOptions = observer(function ModuleOptions(props: Props) {
                   key={option.value}
                   value={option.value}
                   className={({ active, selected }) =>
-                    cn(
-                      "nodedc-dropdown-option",
-                      {
-                        "bg-white/6": active,
-                        "text-primary": selected,
-                        "text-secondary": !selected,
-                      }
-                    )
+                    cn("nodedc-dropdown-option", {
+                      "bg-white/6": active,
+                      "text-primary": selected,
+                      "text-secondary": !selected,
+                    })
                   }
                 >
                   {({ selected }) => (
diff --git a/plane-src/apps/web/core/components/issues/issue-layouts/properties/label-dropdown.tsx b/plane-src/apps/web/core/components/issues/issue-layouts/properties/label-dropdown.tsx
index e70740e..2316428 100644
--- a/plane-src/apps/web/core/components/issues/issue-layouts/properties/label-dropdown.tsx
+++ b/plane-src/apps/web/core/components/issues/issue-layouts/properties/label-dropdown.tsx
@@ -252,9 +252,9 @@ export function LabelDropdown(props: ILabelDropdownProps) {
         multiple
       >
         {isOpen && (
-          <Combobox.Options className="fixed z-10" static>
+          <Combobox.Options data-prevent-outside-click className="nodedc-external-popup-anchor fixed z-[760]" static>
             <div
-              className={`nodedc-dropdown-surface z-10 my-1 h-auto w-52 whitespace-nowrap ${optionsClassName}`}
+              className={`nodedc-dropdown-surface nodedc-external-popup-anchor z-[760] my-1 h-auto w-52 whitespace-nowrap ${optionsClassName}`}
               ref={setPopperElement}
               style={styles.popper}
               {...attributes.popper}
@@ -263,7 +263,7 @@ export function LabelDropdown(props: ILabelDropdownProps) {
                 <SearchIcon className="h-3.5 w-3.5 text-tertiary" />
                 <Combobox.Input
                   ref={inputRef}
-                  className="w-full bg-transparent px-0 py-0 text-12 text-secondary placeholder:text-placeholder outline-none focus:outline-none"
+                  className="w-full bg-transparent px-0 py-0 text-12 text-secondary outline-none placeholder:text-placeholder focus:outline-none"
                   value={query}
                   onChange={(e) => setQuery(e.target.value)}
                   placeholder={t("common.search.label")}