diff --git a/src/components/ReportForm.tsx b/src/components/ReportForm.tsx
index fd59e91..af946de 100644
--- a/src/components/ReportForm.tsx
+++ b/src/components/ReportForm.tsx
@@ -375,7 +375,7 @@ export function ReportForm({ selectedLocation, onLocationSelect, onReportCreated
             <SelectTrigger className="mt-1 h-9 text-sm">
               <SelectValue placeholder="Select" />
             </SelectTrigger>
-            <SelectContent>
+            <SelectContent position="item-aligned">
               {HAZARD_TYPES.map((type) => (
                 <SelectItem key={type.value} value={type.value}>
                   {type.icon} {type.label}
@@ -390,7 +390,7 @@ export function ReportForm({ selectedLocation, onLocationSelect, onReportCreated
             <SelectTrigger className="mt-1 h-9 text-sm">
               <SelectValue placeholder="Select" />
             </SelectTrigger>
-            <SelectContent>
+            <SelectContent position="item-aligned">
               {SEVERITY_LEVELS.map((level) => (
                 <SelectItem key={level.value} value={level.value}>
                   <span className="flex items-center gap-2">
diff --git a/src/components/ui/select.tsx b/src/components/ui/select.tsx
index ea85bc1..93cd424 100644
--- a/src/components/ui/select.tsx
+++ b/src/components/ui/select.tsx
@@ -73,7 +73,7 @@ const SelectContent = React.forwardRef<
     <SelectPrimitive.Content
       ref={ref}
       className={cn(
-        "relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md border bg-popover 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 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+        "relative z-[3000] max-h-96 min-w-[8rem] overflow-hidden rounded-md border bg-popover 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 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
         position === "popper" &&
           "data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
         className