diff --git a/src/assets/styles/pages/post.css b/src/assets/styles/pages/post.css
index ed55fa62..0f9c1052 100644
--- a/src/assets/styles/pages/post.css
+++ b/src/assets/styles/pages/post.css
@@ -5,7 +5,7 @@ article.standalone .associated-media:last-of-type > hr {
 p + .associated-media,
 img + .associated-media,
 .banner + .associated-media,
-.client-side + .associated-media,
+.client-side ~ .associated-media,
 youtube-video + .associated-media {
   margin-top: var(--spacing-base);
   border-top: var(--border-gray);
@@ -24,8 +24,8 @@ youtube-video + .associated-media {
     }
   }
 
-  &:has(+ .client-side > div) {
-    border-bottom: var(--border-gray);
+  &:has(~ *) {
+    margin-bottom: var(--spacing-base);
   }
 
   & ~ youtube-video {
diff --git a/src/includes/partials/blocks/mastodon-post.liquid b/src/includes/partials/blocks/mastodon-post.liquid
index 4a700227..25879b76 100644
--- a/src/includes/partials/blocks/mastodon-post.liquid
+++ b/src/includes/partials/blocks/mastodon-post.liquid
@@ -1,23 +1,23 @@
 {%- if post -%}
 <script type="module" src="/assets/scripts/components/mastodon-post.js"></script>
 <template id="mastodon-post-template">
-  <blockquote data-key="content"></blockquote>
-  <dl>
-    <dt>{% tablericon "refresh" %}</dt>
-    <dd data-key="reblogs_count"></dd>
-    <dt>{% tablericon "message-circle" %}</dt>
-    <dd data-key="replies_count"></dd>
-    <dt>{% tablericon "star" %}</dt>
-    <dd data-key="favourites_count"></dd>
-  </dl>
+  <div class="mastodon-post-wrapper">
+    <blockquote data-key="content"></blockquote>
+    <dl>
+      <dt>{% tablericon "refresh" %}</dt>
+      <dd data-key="reblogs_count"></dd>
+      <dt>{% tablericon "message-circle" %}</dt>
+      <dd data-key="replies_count"></dd>
+      <dt>{% tablericon "star" %}</dt>
+      <dd data-key="favourites_count"></dd>
+    </dl>
+  </div>
 </template>
 <span class="client-side">
-  <div class="mastodon-post-wrapper">
-    <mastodon-post>
-      <a href="{{ post }}">
-        Discuss on Mastodon
-      </a>
-    </mastodon-post>
-  </div>
+  <mastodon-post>
+    <a href="{{ post }}">
+      Discuss on Mastodon
+    </a>
+  </mastodon-post>
 </span>
 {%- endif -%}
\ No newline at end of file