diff --git a/frontend/src/components/workspace/messages/message-list-item.tsx b/frontend/src/components/workspace/messages/message-list-item.tsx
index a5faf4cd1..9f22f5160 100644
--- a/frontend/src/components/workspace/messages/message-list-item.tsx
+++ b/frontend/src/components/workspace/messages/message-list-item.tsx
@@ -36,11 +36,13 @@ import { MarkdownContent } from "./markdown-content";
 
 export function MessageListItem({
   className,
+  threadId,
   message,
   isLoading,
   threadId,
 }: {
   className?: string;
+  threadId?: string;
   message: Message;
   isLoading?: boolean;
   threadId: string;
@@ -61,10 +63,13 @@ export function MessageListItem({
         <MessageToolbar
           className={cn(
             isHuman ? "-bottom-9 justify-end" : "-bottom-8",
-            "absolute right-0 left-0 z-20 opacity-0 transition-opacity delay-200 duration-300 group-hover/conversation-message:opacity-100",
+            "absolute right-0 left-0 z-20",
+            !isHuman && runId && threadId
+              ? "opacity-100"
+              : "opacity-0 transition-opacity delay-200 duration-300 group-hover/conversation-message:opacity-100",
           )}
         >
-          <div className="flex gap-1">
+          <div className="flex gap-1 opacity-0 transition-opacity delay-200 duration-300 group-hover/conversation-message:opacity-100">
             <CopyButton
               clipboardData={
                 extractContentFromMessage(message) ??
@@ -73,6 +78,13 @@ export function MessageListItem({
               }
             />
           </div>
+          {!isHuman && runId && threadId && (
+            <FeedbackButtons
+              threadId={threadId}
+              runId={runId}
+              initialFeedback={feedback ?? null}
+            />
+          )}
         </MessageToolbar>
       )}
     </AIElementMessage>
diff --git a/frontend/src/components/workspace/messages/message-list.tsx b/frontend/src/components/workspace/messages/message-list.tsx
index 28acad1cf..89a638470 100644
--- a/frontend/src/components/workspace/messages/message-list.tsx
+++ b/frontend/src/components/workspace/messages/message-list.tsx
@@ -77,6 +77,7 @@ export function MessageList({
               return (
                 <MessageListItem
                   key={`${group.id}/${msg.id}`}
+                  threadId={threadId}
                   message={msg}
                   isLoading={thread.isLoading}
                   runId={runId}
diff --git a/frontend/src/core/threads/hooks.ts b/frontend/src/core/threads/hooks.ts
index 333c04fb7..36ac28628 100644
--- a/frontend/src/core/threads/hooks.ts
+++ b/frontend/src/core/threads/hooks.ts
@@ -294,6 +294,7 @@ export function useThreadStream({
     onFinish(state) {
       listeners.current.onFinish?.(state.values);
       void queryClient.invalidateQueries({ queryKey: ["threads", "search"] });
+      void queryClient.invalidateQueries({ queryKey: ["thread-feedback"] });
     },
   });