diff --git a/.changeset/selfish-mice-reflect.md b/.changeset/selfish-mice-reflect.md
new file mode 100644
index 000000000..908a021e3
--- /dev/null
+++ b/.changeset/selfish-mice-reflect.md
@@ -0,0 +1,5 @@
+---
+"@easypost/easy-ui": patch
+---
+
+fix(Select,Tooltip): use proper Overlay primitive
diff --git a/easy-ui-react/src/Select/SelectOverlay.tsx b/easy-ui-react/src/Select/SelectOverlay.tsx
index 54667a70e..bca1ea047 100644
--- a/easy-ui-react/src/Select/SelectOverlay.tsx
+++ b/easy-ui-react/src/Select/SelectOverlay.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import {
   DismissButton,
-  OverlayContainer,
+  Overlay,
   mergeProps,
   useListBox,
   usePopover,
@@ -68,7 +68,7 @@ function SelectOverlayContent() {
   } as React.CSSProperties;
 
   return (
-    <OverlayContainer>
+    <Overlay>
       <div {...underlayProps} className={styles.underlay} />
       <div
         {...mergeProps(popoverProps, { style })}
@@ -104,6 +104,6 @@ function SelectOverlayContent() {
         </div>
         <DismissButton onDismiss={selectState.close} />
       </div>
-    </OverlayContainer>
+    </Overlay>
   );
 }
diff --git a/easy-ui-react/src/Tooltip/Tooltip.tsx b/easy-ui-react/src/Tooltip/Tooltip.tsx
index 10f35f9ea..74e54aa78 100644
--- a/easy-ui-react/src/Tooltip/Tooltip.tsx
+++ b/easy-ui-react/src/Tooltip/Tooltip.tsx
@@ -6,7 +6,7 @@ import React, {
   useLayoutEffect,
 } from "react";
 import {
-  OverlayContainer,
+  Overlay,
   Placement,
   mergeProps,
   useOverlayPosition,
@@ -129,14 +129,14 @@ export function Tooltip(props: TooltipProps) {
         ref: triggerRef,
       })}
       {tooltipTriggerState.isOpen && (
-        <OverlayContainer>
+        <Overlay>
           <TooltipInner
             {...props}
             triggerRef={triggerRef}
             tooltipPropsFromTrigger={tooltipPropsFromTrigger}
             tooltipTriggerState={tooltipTriggerState}
           />
-        </OverlayContainer>
+        </Overlay>
       )}
     </>
   );