diff --git a/ui/src/components/task-chat/TaskChatBubble.test.tsx b/ui/src/components/task-chat/TaskChatBubble.test.tsx
index efa46befe8a..3f77f861d11 100644
--- a/ui/src/components/task-chat/TaskChatBubble.test.tsx
+++ b/ui/src/components/task-chat/TaskChatBubble.test.tsx
@@ -155,7 +155,10 @@ describe("TaskChatBubble attachment chips", () => {
       </ThemeProvider>,
     ));
     const toolbar = container.querySelector('[data-testid="task-chat-bubble-actions"]')!;
-    expect(toolbar.parentElement?.parentElement?.textContent).toContain("15m ago");
+    const copyWrapper = toolbar.parentElement!;
+    const timestamp = copyWrapper.nextElementSibling;
+    expect(timestamp?.textContent).toBe("15m ago");
+    expect(timestamp).toBe(copyWrapper.parentElement?.lastElementChild);
     const button = toolbar.querySelector('button[aria-label="Copy message"]') as HTMLButtonElement;
     await act(async () => button.click());
     expect(copyTextToClipboard).toHaveBeenLastCalledWith(text);
diff --git a/ui/src/components/task-chat/TaskChatBubble.tsx b/ui/src/components/task-chat/TaskChatBubble.tsx
index da67905b546..da38b567dff 100644
--- a/ui/src/components/task-chat/TaskChatBubble.tsx
+++ b/ui/src/components/task-chat/TaskChatBubble.tsx
@@ -434,14 +434,14 @@ function TaskChatBubbleContent({
         </div>
       ) : isOwnMessage ? (
         <div className="group/message-toolbar flex items-center gap-1">
+          <div className="transition-opacity motion-reduce:transition-none sm:opacity-0 sm:group-hover/message-toolbar:opacity-100 sm:group-focus-within/message-toolbar:opacity-100 pointer-coarse:opacity-100">
+            <TaskChatBubbleActions copyText={item.text} />
+          </div>
           <span className="px-1 text-(length:--text-micro) text-muted-foreground">
             {sentFromIMessage ? "Sent from iMessage" : null}
             {sentFromIMessage && timestamp ? " · " : null}
             {timestamp}
           </span>
-          <div className="transition-opacity motion-reduce:transition-none sm:opacity-0 sm:group-hover/message-toolbar:opacity-100 sm:group-focus-within/message-toolbar:opacity-100 pointer-coarse:opacity-100">
-            <TaskChatBubbleActions copyText={item.text} />
-          </div>
         </div>
       ) : actions ? (
         streamlined ? (