diff --git a/docs/images/select-bottom-selected-closeup.png b/docs/images/select-bottom-selected-closeup.png
new file mode 100644
index 0000000000..67a36a206d
Binary files /dev/null and b/docs/images/select-bottom-selected-closeup.png differ
diff --git a/docs/images/select-bottom-selected.png b/docs/images/select-bottom-selected.png
new file mode 100644
index 0000000000..612061cda8
Binary files /dev/null and b/docs/images/select-bottom-selected.png differ
diff --git a/docs/images/select-top-selected.png b/docs/images/select-top-selected.png
new file mode 100644
index 0000000000..52e255391e
Binary files /dev/null and b/docs/images/select-top-selected.png differ
diff --git a/packages/react/src/components/select.tsx b/packages/react/src/components/select.tsx
index b449245fe1..358c0da360 100644
--- a/packages/react/src/components/select.tsx
+++ b/packages/react/src/components/select.tsx
@@ -53,8 +53,13 @@ function SelectTrigger({
 function SelectContent({
   className,
   children,
-  position = "item-aligned",
+  // Popper keeps the panel anchored to the trigger (with collision flip) so a
+  // long list does not leave the selected row stranded at the far end of an
+  // item-aligned floating panel. Arrow only renders in popper mode.
+  position = "popper",
   align = "center",
+  sideOffset = 4,
+  collisionPadding = 8,
   ...props
 }: React.ComponentProps<typeof SelectPrimitive.Content>) {
   return (
@@ -62,26 +67,35 @@ function SelectContent({
       <SelectPrimitive.Content
         data-slot="select-content"
         className={cn(
-          "relative z-50 max-h-(--radix-select-content-available-height) min-w-[8rem] origin-(--radix-select-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border bg-popover text-popover-foreground shadow-md 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 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95",
-          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",
+          // Overflow stays on the viewport so the side arrow is not clipped when
+          // the menu flips above/below the trigger.
+          "relative z-50 max-h-(--radix-select-content-available-height) min-w-[8rem] origin-(--radix-select-content-transform-origin) overflow-visible rounded-md border bg-popover text-popover-foreground shadow-md 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 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-95",
           className,
         )}
         position={position}
         align={align}
+        sideOffset={sideOffset}
+        collisionPadding={collisionPadding}
         {...props}
       >
         <SelectScrollUpButton />
         <SelectPrimitive.Viewport
           className={cn(
-            "p-1",
-            position === "popper" &&
-              "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)] scroll-my-1",
+            "overflow-x-hidden overflow-y-auto rounded-[inherit] p-1",
+            position === "popper" && "w-full min-w-[var(--radix-select-trigger-width)] scroll-my-1",
           )}
         >
           {children}
         </SelectPrimitive.Viewport>
         <SelectScrollDownButton />
+        {position === "popper" ? (
+          <SelectPrimitive.Arrow
+            data-slot="select-arrow"
+            width={11}
+            height={5}
+            className="fill-popover stroke-border"
+          />
+        ) : null}
       </SelectPrimitive.Content>
     </SelectPrimitive.Portal>
   );