diff --git a/package.json b/package.json
index 1133e0d..503d3a9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@internxt/ui",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Library of Internxt components",
   "repository": {
     "type": "git",
diff --git a/src/components/list/List.tsx b/src/components/list/List.tsx
index 56f70e6..8f4d15d 100644
--- a/src/components/list/List.tsx
+++ b/src/components/list/List.tsx
@@ -298,12 +298,12 @@ const List = <T extends { id: number }, F extends keyof T>({
   return (
     <div
       id="generic-list-component"
-      className={`relative flex h-full flex-col overflow-x-auto overflow-y-hidden ${className}`}
+      className={`relative isolate flex h-full flex-col overflow-x-auto overflow-y-hidden ${className}`}
       ref={containerRef}
     >
       {/* BODY */}
       <div id="scrollableList" className="flex h-full flex-col min-w-max overflow-x-hidden overflow-y-auto">
-        <div className={`sticky top-0 z-10 ${headerBackgroundColor}`}>
+        <div className={`sticky top-0 z-50 ${headerBackgroundColor}`}>
           {!isEmptyState ? (
             <ListHeader
               selectedItems={selectedItems}
diff --git a/src/components/list/ListItem.tsx b/src/components/list/ListItem.tsx
index 95b0203..fd86c07 100644
--- a/src/components/list/ListItem.tsx
+++ b/src/components/list/ListItem.tsx
@@ -153,7 +153,7 @@ const ListItem = <T extends { id: number }>({
       ref={rootWrapperRef}
       className={`group relative flex h-14 flex-row items-center pl-14 pr-5 ${
         selected ? 'bg-primary/10 text-gray-100 dark:bg-primary/20' : 'focus-within:bg-gray-1 hover:bg-gray-1'
-      }`}
+      } ${isOpen ? 'z-40' : ''}`}
       onMouseEnter={onMouseEnter}
       onMouseLeave={onMouseLeave}
     >
diff --git a/src/components/list/__test__/__snapshots__/List.test.tsx.snap b/src/components/list/__test__/__snapshots__/List.test.tsx.snap
index 96d46b1..47ad58d 100644
--- a/src/components/list/__test__/__snapshots__/List.test.tsx.snap
+++ b/src/components/list/__test__/__snapshots__/List.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`List component > should match snapshot 1`] = `
   "baseElement": <body>
     <div>
       <div
-        class="relative flex h-full flex-col overflow-x-auto overflow-y-hidden undefined"
+        class="relative isolate flex h-full flex-col overflow-x-auto overflow-y-hidden undefined"
         id="generic-list-component"
       >
         <div
@@ -14,7 +14,7 @@ exports[`List component > should match snapshot 1`] = `
           id="scrollableList"
         >
           <div
-            class="sticky top-0 z-10 bg-surface"
+            class="sticky top-0 z-50 bg-surface"
           >
             <div
               class="flex min-w-max h-12 shrink-0 flex-row px-5"
@@ -85,7 +85,7 @@ exports[`List component > should match snapshot 1`] = `
           </div>
           <div>
             <div
-              class="group relative flex h-14 flex-row items-center pl-14 pr-5 bg-primary/10 text-gray-100 dark:bg-primary/20"
+              class="group relative flex h-14 flex-row items-center pl-14 pr-5 bg-primary/10 text-gray-100 dark:bg-primary/20 "
             >
               <div
                 class="absolute left-5 top-0 flex h-full w-0 flex-row items-center justify-start p-0 opacity-0 focus-within:opacity-100 group-hover:opacity-100 opacity-100"
@@ -147,7 +147,7 @@ exports[`List component > should match snapshot 1`] = `
               </div>
             </div>
             <div
-              class="group relative flex h-14 flex-row items-center pl-14 pr-5 focus-within:bg-gray-1 hover:bg-gray-1"
+              class="group relative flex h-14 flex-row items-center pl-14 pr-5 focus-within:bg-gray-1 hover:bg-gray-1 "
             >
               <div
                 class="absolute left-5 top-0 flex h-full w-0 flex-row items-center justify-start p-0 opacity-0 focus-within:opacity-100 group-hover:opacity-100 false"
@@ -204,7 +204,7 @@ exports[`List component > should match snapshot 1`] = `
   </body>,
   "container": <div>
     <div
-      class="relative flex h-full flex-col overflow-x-auto overflow-y-hidden undefined"
+      class="relative isolate flex h-full flex-col overflow-x-auto overflow-y-hidden undefined"
       id="generic-list-component"
     >
       <div
@@ -212,7 +212,7 @@ exports[`List component > should match snapshot 1`] = `
         id="scrollableList"
       >
         <div
-          class="sticky top-0 z-10 bg-surface"
+          class="sticky top-0 z-50 bg-surface"
         >
           <div
             class="flex min-w-max h-12 shrink-0 flex-row px-5"
@@ -283,7 +283,7 @@ exports[`List component > should match snapshot 1`] = `
         </div>
         <div>
           <div
-            class="group relative flex h-14 flex-row items-center pl-14 pr-5 bg-primary/10 text-gray-100 dark:bg-primary/20"
+            class="group relative flex h-14 flex-row items-center pl-14 pr-5 bg-primary/10 text-gray-100 dark:bg-primary/20 "
           >
             <div
               class="absolute left-5 top-0 flex h-full w-0 flex-row items-center justify-start p-0 opacity-0 focus-within:opacity-100 group-hover:opacity-100 opacity-100"
@@ -345,7 +345,7 @@ exports[`List component > should match snapshot 1`] = `
             </div>
           </div>
           <div
-            class="group relative flex h-14 flex-row items-center pl-14 pr-5 focus-within:bg-gray-1 hover:bg-gray-1"
+            class="group relative flex h-14 flex-row items-center pl-14 pr-5 focus-within:bg-gray-1 hover:bg-gray-1 "
           >
             <div
               class="absolute left-5 top-0 flex h-full w-0 flex-row items-center justify-start p-0 opacity-0 focus-within:opacity-100 group-hover:opacity-100 false"
diff --git a/src/components/list/__test__/__snapshots__/ListItem.test.tsx.snap b/src/components/list/__test__/__snapshots__/ListItem.test.tsx.snap
index fd3dbd7..f78853b 100644
--- a/src/components/list/__test__/__snapshots__/ListItem.test.tsx.snap
+++ b/src/components/list/__test__/__snapshots__/ListItem.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`ListItem > should match snapshot 1`] = `
   "baseElement": <body>
     <div>
       <div
-        class="group relative flex h-14 flex-row items-center pl-14 pr-5 focus-within:bg-gray-1 hover:bg-gray-1"
+        class="group relative flex h-14 flex-row items-center pl-14 pr-5 focus-within:bg-gray-1 hover:bg-gray-1 "
       >
         <div
           class="absolute left-5 top-0 flex h-full w-0 flex-row items-center justify-start p-0 opacity-0 focus-within:opacity-100 group-hover:opacity-100 false"
@@ -56,7 +56,7 @@ exports[`ListItem > should match snapshot 1`] = `
   </body>,
   "container": <div>
     <div
-      class="group relative flex h-14 flex-row items-center pl-14 pr-5 focus-within:bg-gray-1 hover:bg-gray-1"
+      class="group relative flex h-14 flex-row items-center pl-14 pr-5 focus-within:bg-gray-1 hover:bg-gray-1 "
     >
       <div
         class="absolute left-5 top-0 flex h-full w-0 flex-row items-center justify-start p-0 opacity-0 focus-within:opacity-100 group-hover:opacity-100 false"
