diff --git a/packages/@react-spectrum/s2/src/Popover.tsx b/packages/@react-spectrum/s2/src/Popover.tsx
index 6ead949d693..4eec2d1cbb3 100644
--- a/packages/@react-spectrum/s2/src/Popover.tsx
+++ b/packages/@react-spectrum/s2/src/Popover.tsx
@@ -98,12 +98,13 @@ let popover = style(
       default: 'elevated',
       isArrowShown: 'none'
     },
-    outlineStyle: 'solid',
-    outlineWidth: 1,
-    outlineColor: {
+    borderStyle: 'solid',
+    borderWidth: 1,
+    borderColor: {
       default: lightDark('transparent-white-25', 'gray-200'),
       forcedColors: 'ButtonBorder'
     },
+    outlineStyle: 'none',
     width: {
       size: {
         // Copied from designs, not sure if correct.
@@ -154,7 +155,8 @@ let popover = style(
     isolation: 'isolate',
     pointerEvents: {
       isExiting: 'none'
-    }
+    },
+    overflow: 'auto'
   },
   getAllowedOverrides()
 );
@@ -322,7 +324,6 @@ const innerDivStyle = style(
     boxSizing: 'border-box',
     outlineStyle: 'none',
     borderRadius: 'inherit',
-    overflow: 'auto',
     position: 'relative',
     width: 'full',
     maxSize: 'inherit'