diff --git a/frontend/app/components/assistant-ui/thread-list.tsx b/frontend/app/components/assistant-ui/thread-list.tsx
index 26b678c..7a185fa 100644
--- a/frontend/app/components/assistant-ui/thread-list.tsx
+++ b/frontend/app/components/assistant-ui/thread-list.tsx
@@ -479,6 +479,11 @@ const ClawSessionList: FC = () => {
 					const active = activeSessionId === session.session_id;
 					const loading = loadingSessionId === session.session_id;
 					const badge = sessionBadges.bySessionId.get(session.session_id);
+					const actionPinned =
+						badge?.running === true ||
+						badge?.unread === true ||
+						deletingSessionId === session.session_id ||
+						openMenuSessionId === session.session_id;
 					return (
 						<div
 							key={`claw-session-${session.session_id}-${session.modified_at}`}
@@ -515,7 +520,9 @@ const ClawSessionList: FC = () => {
 							) : (
 								<button
 									type="button"
-									className="aui-thread-list-item-trigger flex h-full min-w-0 flex-1 items-center overflow-hidden px-3 text-start text-sm"
+									className={`aui-thread-list-item-trigger flex h-full min-w-0 flex-1 items-center overflow-hidden pl-3 text-start text-sm ${
+										actionPinned ? "pr-7" : "pr-2"
+									}`}
 									onClick={async () => {
 										console.log("[session-list] click", {
 											sessionId: session.session_id,
@@ -718,7 +725,7 @@ function SessionActionSlot({
 }) {
 	const hasBadge = running || unread;
 	return (
-		<div className="relative mr-2 flex size-7 shrink-0 items-center justify-center">
+		<div className="absolute top-1/2 right-1 z-10 flex size-6 -translate-y-1/2 items-center justify-center">
 			<span
 				aria-hidden={!hasBadge}
 				className="pointer-events-none absolute inset-0 flex items-center justify-center text-muted-foreground transition-opacity group-hover:opacity-0 data-[hidden=true]:opacity-0 data-[open=true]:opacity-0"