diff --git a/apps/web/src/components/EmailEditor/Toolbar.tsx b/apps/web/src/components/EmailEditor/Toolbar.tsx
index 754a731..27ac88c 100644
--- a/apps/web/src/components/EmailEditor/Toolbar.tsx
+++ b/apps/web/src/components/EmailEditor/Toolbar.tsx
@@ -213,7 +213,7 @@ export function Toolbar({editor, onInsertVariable, onInsertImage, canUploadImage
   }
 
   return (
-    <div className="border-b border-neutral-200 bg-neutral-50 p-2 flex flex-wrap gap-1 sticky top-0 z-10">
+    <div className="border-b border-neutral-200 bg-neutral-50 p-2 flex flex-wrap gap-1 sticky top-0 z-40">
       {/* History */}
       <div className="flex gap-0.5 pr-2 border-r border-neutral-200">
         <Button
diff --git a/apps/web/src/pages/campaigns/[id].tsx b/apps/web/src/pages/campaigns/[id].tsx
index df9bdf2..7b8146d 100644
--- a/apps/web/src/pages/campaigns/[id].tsx
+++ b/apps/web/src/pages/campaigns/[id].tsx
@@ -591,7 +591,7 @@ export default function CampaignDetailsPage() {
           </div>
 
           {/* Email Editor - Full Width */}
-          <Card>
+          <Card className="overflow-visible">
             <CardHeader>
               <CardTitle>Email Content</CardTitle>
               <CardDescription>Design your email using the visual editor or paste custom HTML</CardDescription>
diff --git a/apps/web/src/pages/campaigns/create.tsx b/apps/web/src/pages/campaigns/create.tsx
index a6f48ef..96c9759 100644
--- a/apps/web/src/pages/campaigns/create.tsx
+++ b/apps/web/src/pages/campaigns/create.tsx
@@ -291,7 +291,7 @@ export default function CreateCampaignPage() {
                 </Card>
 
                 {/* Email Content */}
-                <Card>
+                <Card className="overflow-visible">
                   <CardHeader>
                     <StepHeader stepNumber={3} title="Email Content" description="Design your email message" />
                   </CardHeader>
diff --git a/apps/web/src/pages/templates/[id].tsx b/apps/web/src/pages/templates/[id].tsx
index fd21b70..f7883fa 100644
--- a/apps/web/src/pages/templates/[id].tsx
+++ b/apps/web/src/pages/templates/[id].tsx
@@ -279,7 +279,7 @@ export default function TemplateEditorPage() {
 
           {/* Email Body */}
           <div>
-            <Card>
+            <Card className="overflow-visible">
               <CardHeader>
                 <CardTitle>Email Body</CardTitle>
                 <CardDescription>Create your email using the visual editor or paste custom HTML</CardDescription>
diff --git a/apps/web/src/pages/templates/create.tsx b/apps/web/src/pages/templates/create.tsx
index 576be7b..42c9a62 100644
--- a/apps/web/src/pages/templates/create.tsx
+++ b/apps/web/src/pages/templates/create.tsx
@@ -179,7 +179,7 @@ export default function CreateTemplatePage() {
             </Card>
 
             {/* Email Body */}
-            <Card>
+            <Card className="overflow-visible">
               <CardHeader>
                 <CardTitle>Email Body</CardTitle>
                 <CardDescription>Create your email using the visual editor or paste custom HTML</CardDescription>