diff --git a/packages/@react-spectrum/s2/src/ActionBar.tsx b/packages/@react-spectrum/s2/src/ActionBar.tsx
index b73d0669a9c..f4f9583a0fb 100644
--- a/packages/@react-spectrum/s2/src/ActionBar.tsx
+++ b/packages/@react-spectrum/s2/src/ActionBar.tsx
@@ -161,8 +161,8 @@ const ActionBarInner = forwardRef(function ActionBarInner(props: ActionBarProps
         ref={objectRef}
         {...otherProps}
         {...keyboardProps}
-        className={actionBarStyles({isEmphasized, isInContainer: !!scrollRef, isEntering, isExiting})}
-        style={{insetInlineEnd: `calc(var(--insetEnd) + ${scrollbarWidth}px)`}}>
+        className={(props.UNSAFE_className || '') + actionBarStyles({isEmphasized, isInContainer: !!scrollRef, isEntering, isExiting})}
+        style={{insetInlineEnd: `calc(var(--insetEnd) + ${scrollbarWidth}px)`, ...props.UNSAFE_style}}>
         <div className={style({order: 1, marginStart: 'auto'})}>
           <ActionButtonGroup
             staticColor={isEmphasized ? 'auto' : undefined}
diff --git a/starters/docs/src/GridList.css b/starters/docs/src/GridList.css
index 78b5f0ae1d5..4b74fb78712 100644
--- a/starters/docs/src/GridList.css
+++ b/starters/docs/src/GridList.css
@@ -266,7 +266,7 @@
 .react-aria-GridListHeader {
   position: sticky;
   z-index: 2;
-  top: -8px;
+  top: calc(var(--spacing-2) * -1);
   font-size: var(--font-size-lg);
   font-weight: 500;
   background: var(--gray-100);