diff --git a/src/lib/components/layout/Sidebar/ChatItem.svelte b/src/lib/components/layout/Sidebar/ChatItem.svelte
index deb9281f69..1a85ad44f5 100644
--- a/src/lib/components/layout/Sidebar/ChatItem.svelte
+++ b/src/lib/components/layout/Sidebar/ChatItem.svelte
@@ -515,11 +515,11 @@
 
 {#snippet chatItemContent()}
 	{#if ownerUserId}
-		<Tooltip content={ownerName || 'Unknown'}>
+		<Tooltip content={ownerName || 'Unknown'} className="flex items-center self-center shrink-0">
 			<img
 				src="{WEBUI_API_BASE_URL}/users/{ownerUserId}/profile/image"
 				alt=""
-				class="size-3.5 rounded-full shrink-0 object-cover mr-1.5"
+				class="size-3.5 rounded-full shrink-0 object-cover mr-2"
 				on:error={(e) => {
 					if (!e.currentTarget.src.endsWith('/static/favicon.png')) {
 						e.currentTarget.src = `${WEBUI_BASE_URL}/static/favicon.png`;
diff --git a/src/lib/components/layout/Sidebar/RecursiveFolder.svelte b/src/lib/components/layout/Sidebar/RecursiveFolder.svelte
index e8bdf7e894..d8f68ae8cb 100644
--- a/src/lib/components/layout/Sidebar/RecursiveFolder.svelte
+++ b/src/lib/components/layout/Sidebar/RecursiveFolder.svelte
@@ -954,8 +954,10 @@
 							updatedAt={chat.updated_at}
 							lastReadAt={chat.last_read_at}
 							active={chat.active ?? false}
-							ownerName={folders[folderId]?.shared ? (chat.owner_name ?? null) : null}
-							ownerUserId={folders[folderId]?.shared && chat.owner_name ? chat.user_id : null}
+							ownerName={chat.owner_name ?? null}
+							ownerUserId={folders[folderId]?.shared || chat.user_id !== $user?.id
+								? chat.user_id
+								: null}
 							readonly={chat.user_id !== $user?.id}
 							{shiftKey}
 							onReadStateChange={applyReadState}