diff --git a/app/javascript/mastodon/components/status/attachments.module.scss b/app/javascript/mastodon/components/status/attachments.module.scss
index 781b8da49d9..77cc534bb6b 100644
--- a/app/javascript/mastodon/components/status/attachments.module.scss
+++ b/app/javascript/mastodon/components/status/attachments.module.scss
@@ -24,7 +24,11 @@
   }
 }
 
-.gallerySpoilerWrapper {
+.galleryContent {
+  border-radius: var(--radius-4);
+}
+
+.gallerySpoiler {
   margin-bottom: var(--space-2);
 }
 
diff --git a/app/javascript/mastodon/components/status/attachments.tsx b/app/javascript/mastodon/components/status/attachments.tsx
index 8c7db1b73fe..ce8be474009 100644
--- a/app/javascript/mastodon/components/status/attachments.tsx
+++ b/app/javascript/mastodon/components/status/attachments.tsx
@@ -55,7 +55,7 @@ export const StatusAttachments: React.FC<{
       <MediaAttachments
         statusId={statusId}
         accountId={status.account.id}
-        sensitive={status.sensitive && !status.spoiler_text}
+        sensitive={status.sensitive}
         language={status.translation?.language ?? status.language}
         attachment={attachment}
         restAttachments={status.media_attachments.slice(1)}
@@ -349,7 +349,7 @@ const MediaAttachmentWrapper: React.FC<{
     <div className={classes.galleryWrapper} ref={wrapperRef}>
       {showSpoiler && (
         <Callout
-          className={classes.gallerySpoilerWrapper}
+          className={classes.gallerySpoiler}
           icon={WarningIcon}
           actionClick={onToggle}
           actionText={
@@ -373,6 +373,7 @@ const MediaAttachmentWrapper: React.FC<{
         data-color-scheme='dark'
         className={classNames(
           mainClasses.contentWrapper,
+          classes.galleryContent,
           !visible && mainClasses.hasContentWarning,
           !visible && classes.galleryHideButtons,
         )}
diff --git a/app/javascript/mastodon/components/status/styles.module.scss b/app/javascript/mastodon/components/status/styles.module.scss
index bd60d25b506..0bc02f9729c 100644
--- a/app/javascript/mastodon/components/status/styles.module.scss
+++ b/app/javascript/mastodon/components/status/styles.module.scss
@@ -107,6 +107,9 @@
 .contentWrapper {
   --fade-time: 100ms;
 
+  overflow: clip;
+  border-radius: var(--radius-2);
+
   &.isFiltered {
     display: none;
   }
@@ -142,9 +145,6 @@
   }
 
   &.hasContentWarning {
-    overflow: clip;
-    border-radius: var(--radius-4);
-
     &::after {
       visibility: visible;
       opacity: 1;