diff --git a/src/components/status.css b/src/components/status.css
index d49c9f1f..f601066d 100644
--- a/src/components/status.css
+++ b/src/components/status.css
@@ -325,12 +325,40 @@
   min-height: 160px;
   max-height: 60vh;
 }
-.status .media {
+.status .media-container .media {
   border-radius: 8px;
   overflow: hidden;
   min-height: 80px;
   border: 1px solid var(--outline-color);
 }
+/* Special media borders */
+.status .media-container.media-eq2 .media:first-of-type {
+  border-radius: 8px 0 0 8px;
+}
+.status .media-container.media-eq2 .media:last-of-type {
+  border-radius: 0 8px 8px 0;
+}
+.status .media-container.media-eq3 .media:first-of-type {
+  border-radius: 8px 0 0 8px;
+}
+.status .media-container.media-eq3 .media:nth-of-type(2) {
+  border-radius: 0 8px 0 0;
+}
+.status .media-container.media-eq3 .media:last-of-type {
+  border-radius: 0 0 8px 0;
+}
+.status .media-container.media-eq4 .media:first-of-type {
+  border-radius: 8px 0 0 0;
+}
+.status .media-container.media-eq4 .media:nth-of-type(2) {
+  border-radius: 0 8px 0 0;
+}
+.status .media-container.media-eq4 .media:nth-of-type(3) {
+  border-radius: 0 0 0 8px;
+}
+.status .media-container.media-eq4 .media:last-of-type {
+  border-radius: 0 0 8px 0;
+}
 .status .media:only-child {
   grid-area: span 2 / span 2;
 }
diff --git a/src/components/status.jsx b/src/components/status.jsx
index 73ea1e27..8bfa0a01 100644
--- a/src/components/status.jsx
+++ b/src/components/status.jsx
@@ -391,7 +391,7 @@ function Status({
           )}
           {!!mediaAttachments.length && (
             <div
-              class={`media-container ${
+              class={`media-container media-eq${mediaAttachments.length} ${
                 mediaAttachments.length > 2 ? 'media-gt2' : ''
               } ${mediaAttachments.length > 4 ? 'media-gt4' : ''}`}
             >