diff --git a/src/lib/feature/post/PostMeta.svelte b/src/lib/feature/post/PostMeta.svelte
index 391c938d..47691785 100644
--- a/src/lib/feature/post/PostMeta.svelte
+++ b/src/lib/feature/post/PostMeta.svelte
@@ -204,7 +204,7 @@
     <CommunityLink
       {community}
       style="grid-area: community;"
-      class="shrink no-list-margin"
+      class="shrink no-list-margin justify-self-start"
     />
   {/if}
   <div
diff --git a/src/lib/feature/user/UserLink.svelte b/src/lib/feature/user/UserLink.svelte
index 8cf0b670..0613c83e 100644
--- a/src/lib/feature/user/UserLink.svelte
+++ b/src/lib/feature/user/UserLink.svelte
@@ -82,6 +82,12 @@
   }: Props = $props()
 
   let envBadge = $derived(getEnvBadge(user.did))
+  let shownName = $derived(
+    displayName ? user.displayName || user.handle : user.handle,
+  )
+  // Without a displayName the primary text already IS the handle — appending
+  // "@handle" would render it twice (e.g. "mari.dev@mari.dev").
+  let showHandleSuffix = $derived(showInstance && shownName !== user.handle)
 </script>
 
 <a
@@ -106,9 +112,9 @@
       class:font-medium={showInstance}
       class="username-text {envBadge && envBadge.classes}"
     >
-      {displayName ? user.displayName || user.handle : user.handle}
+      {shownName}
     </span>
-    {#if showInstance}
+    {#if showHandleSuffix}
       <span
         class="text-slate-500 dark:text-zinc-500 font-normal instance-text shrink {instanceClass ??
           ''}"
diff --git a/src/routes/c/[handle=handle]/post/[rkey]/+page.svelte b/src/routes/c/[handle=handle]/post/[rkey]/+page.svelte
index a38138d5..af93f746 100644
--- a/src/routes/c/[handle=handle]/post/[rkey]/+page.svelte
+++ b/src/routes/c/[handle=handle]/post/[rkey]/+page.svelte
@@ -171,7 +171,7 @@
   {#if data.data.value?.post}
     {@const post = data.data.value.post}
 
-    <Material padding="none" rounding="2xl" class="overflow-hidden">
+    <Material padding="none" rounding="2xl" class="overflow-hidden px-4">
       <Post {post} actions={true} view="cozy" />
     </Material>