diff --git a/website/public/locales/en/chat.json b/website/public/locales/en/chat.json
index a5c6ef9a5c..adbf5d98d0 100644
--- a/website/public/locales/en/chat.json
+++ b/website/public/locales/en/chat.json
@@ -46,5 +46,7 @@
   "save_preset": "Save this preset",
   "preset_exists_error": "A preset with this name already exists",
   "preset_name_placeholder": "Enter name",
-  "feedback_message": "Thoughts? Let us know!"
+  "feedback_message": "How did I do? Your feedback will make me better!",
+  "feedback_action_great": "Good",
+  "feedback_action_poor": "Could be better"
 }
diff --git a/website/src/components/Chat/ChatConversation.tsx b/website/src/components/Chat/ChatConversation.tsx
index eaff46a87d..089b2861b0 100644
--- a/website/src/components/Chat/ChatConversation.tsx
+++ b/website/src/components/Chat/ChatConversation.tsx
@@ -39,6 +39,8 @@ export const ChatConversation = memo(function ChatConversation({ chatId, getConf
   const [streamedResponse, setResponse] = useState<string | null>(null);
   const [queueInfo, setQueueInfo] = useState<QueueInfo | null>(null);
   const [isSending, setIsSending] = useBoolean();
+  const [showEncourageMessage, setShowEncourageMessage] = useBoolean(false);
+
   const toast = useToast();
 
   const { isLoading: isLoadingMessages } = useSWR<ChatItem>(chatId ? API_ROUTES.GET_CHAT(chatId) : null, get, {
@@ -110,8 +112,9 @@ export const ChatConversation = memo(function ChatConversation({ chatId, getConf
       setQueueInfo(null);
       setResponse(null);
       setIsSending.off();
+      setShowEncourageMessage.on();
     },
-    [getConfigValues, setIsSending, toast]
+    [getConfigValues, setIsSending, setShowEncourageMessage, toast]
   );
   const sendPrompterMessage = useCallback(async () => {
     const content = inputRef.current?.value.trim();
@@ -119,6 +122,7 @@ export const ChatConversation = memo(function ChatConversation({ chatId, getConf
       return;
     }
     setIsSending.on();
+    setShowEncourageMessage.off();
 
     // TODO: maybe at some point we won't need to access the rendered HTML directly, but use react state
     const parentId = document.getElementById(LAST_ASSISTANT_MESSAGE_ID)?.dataset.id ?? null;
@@ -164,7 +168,7 @@ export const ChatConversation = memo(function ChatConversation({ chatId, getConf
     inputRef.current!.value = "";
     // after creating the prompters message, handle the assistant's case
     await createAndFetchAssistantMessage({ parentId: prompter_message.id, chatId });
-  }, [setIsSending, chatId, messages, createAndFetchAssistantMessage, toast, isSending]);
+  }, [isSending, setIsSending, setShowEncourageMessage, chatId, messages, createAndFetchAssistantMessage, toast]);
 
   const sendVote = useMessageVote();
 
@@ -284,6 +288,8 @@ export const ChatConversation = memo(function ChatConversation({ chatId, getConf
             isSending={isSending}
             retryingParentId={retryingParentId}
             onEditPromtp={handleEditPrompt}
+            showEncourageMessage={showEncourageMessage}
+            onEncourageMessageClose={setShowEncourageMessage.off}
           ></ChatConversationTree>
           {isSending && streamedResponse && <PendingMessageEntry isAssistant content={streamedResponse} />}
           <div ref={messagesEndRef} style={{ height: 0 }}></div>
diff --git a/website/src/components/Chat/ChatConversationTree.tsx b/website/src/components/Chat/ChatConversationTree.tsx
index a342cbab86..a9baeb71b9 100644
--- a/website/src/components/Chat/ChatConversationTree.tsx
+++ b/website/src/components/Chat/ChatConversationTree.tsx
@@ -76,6 +76,7 @@ const TreeChildren = ({
       message={currentTree}
       {...props}
       canRetry={isLeaf}
+      showEncourageMessage={props.showEncourageMessage && isLeaf}
       // TODO refacor away from this dirty hack
       id={isLeaf && currentTree.role === "assistant" ? LAST_ASSISTANT_MESSAGE_ID : undefined}
       data-id={currentTree.id}
diff --git a/website/src/components/Chat/ChatMessageEntry.tsx b/website/src/components/Chat/ChatMessageEntry.tsx
index 7095e1b3fa..53cbda7465 100644
--- a/website/src/components/Chat/ChatMessageEntry.tsx
+++ b/website/src/components/Chat/ChatMessageEntry.tsx
@@ -21,8 +21,8 @@ import { InferenceMessage } from "src/types/Chat";
 import { BaseMessageEntry } from "../Messages/BaseMessageEntry";
 import { BaseMessageEmojiButton } from "../Messages/MessageEmojiButton";
 import { MessageInlineEmojiRow } from "../Messages/MessageInlineEmojiRow";
-import { WorkParametersDisplay } from "./WorkParameters";
 import { EncourageMessage } from "./EncourageMessage";
+import { WorkParametersDisplay } from "./WorkParameters";
 
 export type EditPromptParams = { parentId: string; chatId: string; content: string };
 
@@ -36,6 +36,8 @@ export type ChatMessageEntryProps = {
   canRetry?: boolean;
   id?: string;
   "data-id"?: string;
+  showEncourageMessage: boolean;
+  onEncourageMessageClose: () => void;
 };
 
 export const ChatMessageEntry = memo(function ChatMessageEntry({
@@ -46,6 +48,8 @@ export const ChatMessageEntry = memo(function ChatMessageEntry({
   pagingSlot,
   onEditPromtp,
   canRetry,
+  showEncourageMessage,
+  onEncourageMessageClose,
   ...props
 }: ChatMessageEntryProps) {
   const { t } = useTranslation("common");
@@ -114,74 +118,82 @@ export const ChatMessageEntry = memo(function ChatMessageEntry({
   const { onCopy, hasCopied } = useClipboard(message.content);
 
   return (
-    <PendingMessageEntry
-      ref={ref}
-      {...props}
-      isAssistant={isAssistant}
-      usedPlugin={used_plugin}
-      content={isEditing ? "" : content!}
-    >
-      {!isAssistant && parentId !== null && (
-        <Box position="absolute" top={{ base: "4", md: 0 }} style={{ insetInlineEnd: `0.5rem` }}>
-          {isEditing ? (
-            <MessageInlineEmojiRow spacing="0">
-              <BaseMessageEmojiButton emoji={Check} onClick={handleEditSubmit}></BaseMessageEmojiButton>
-              <BaseMessageEmojiButton emoji={X} onClick={setIsEditing.off}></BaseMessageEmojiButton>
-            </MessageInlineEmojiRow>
-          ) : (
-            <BaseMessageEmojiButton emoji={Edit} onClick={setIsEditing.on}></BaseMessageEmojiButton>
-          )}
-        </Box>
-      )}
-      {isEditing && (
-        <Box mx={{ md: "-15px" }} mt={{ md: 2 }}>
-          <Textarea
-            defaultValue={content || ""}
-            ref={inputRef}
-            onKeyDown={handleKeydown}
-            bg="gray.100"
-            borderRadius="xl"
-            _dark={{
-              bg: "gray.800",
-            }}
-            autoFocus
-          ></Textarea>
-        </Box>
-      )}
-      {!isEditing && (
-        <Flex justifyContent={pagingSlot ? "space-between" : "end"} mt="1">
-          {pagingSlot}
-          {isAssistant && (
-            <MessageInlineEmojiRow>
-              {(state === "pending" || state === "in_progress") && (
-                <CircularProgress isIndeterminate size="20px" title={state} />
-              )}
-              {(state === "aborted_by_worker" || state === "cancelled" || state === "timeout") && (
-                <>
-                  <Icon as={XCircle} color="red" />
-                  <Text color="red">{`Error: ${state}`}</Text>
-                  {onRetry && !isSending && <Button onClick={handleRetry}>{t("retry")}</Button>}
-                </>
-              )}
-              {state === "complete" && (
-                <>
-                  <EncourageMessage />
-                  {canRetry && <BaseMessageEmojiButton emoji={RotateCcw} onClick={handleRetry} label={t("retry")} />}
-                  {!hasCopied ? (
-                    <BaseMessageEmojiButton emoji={Copy} onClick={onCopy} label={t("copy")} />
-                  ) : (
-                    <BaseMessageEmojiButton emoji={Check} />
-                  )}
-                  <BaseMessageEmojiButton emoji={ThumbsUp} checked={score === 1} onClick={handleThumbsUp} />
-                  <BaseMessageEmojiButton emoji={ThumbsDown} checked={score === -1} onClick={handleThumbsDown} />
-                </>
-              )}
-            </MessageInlineEmojiRow>
-          )}
-        </Flex>
+    <>
+      <PendingMessageEntry
+        ref={ref}
+        {...props}
+        isAssistant={isAssistant}
+        usedPlugin={used_plugin}
+        content={isEditing ? "" : content!}
+      >
+        {!isAssistant && parentId !== null && (
+          <Box position="absolute" top={{ base: "4", md: 0 }} style={{ insetInlineEnd: `0.5rem` }}>
+            {isEditing ? (
+              <MessageInlineEmojiRow spacing="0">
+                <BaseMessageEmojiButton emoji={Check} onClick={handleEditSubmit}></BaseMessageEmojiButton>
+                <BaseMessageEmojiButton emoji={X} onClick={setIsEditing.off}></BaseMessageEmojiButton>
+              </MessageInlineEmojiRow>
+            ) : (
+              <BaseMessageEmojiButton emoji={Edit} onClick={setIsEditing.on}></BaseMessageEmojiButton>
+            )}
+          </Box>
+        )}
+        {isEditing && (
+          <Box mx={{ md: "-15px" }} mt={{ md: 2 }}>
+            <Textarea
+              defaultValue={content || ""}
+              ref={inputRef}
+              onKeyDown={handleKeydown}
+              bg="gray.100"
+              borderRadius="xl"
+              _dark={{
+                bg: "gray.800",
+              }}
+              autoFocus
+            ></Textarea>
+          </Box>
+        )}
+        {!isEditing && (
+          <Flex justifyContent={pagingSlot ? "space-between" : "end"} mt="1">
+            {pagingSlot}
+            {isAssistant && (
+              <MessageInlineEmojiRow>
+                {(state === "pending" || state === "in_progress") && (
+                  <CircularProgress isIndeterminate size="20px" title={state} />
+                )}
+                {(state === "aborted_by_worker" || state === "cancelled" || state === "timeout") && (
+                  <>
+                    <Icon as={XCircle} color="red" />
+                    <Text color="red">{`Error: ${state}`}</Text>
+                    {onRetry && !isSending && <Button onClick={handleRetry}>{t("retry")}</Button>}
+                  </>
+                )}
+                {state === "complete" && (
+                  <>
+                    {canRetry && <BaseMessageEmojiButton emoji={RotateCcw} onClick={handleRetry} label={t("retry")} />}
+                    {!hasCopied ? (
+                      <BaseMessageEmojiButton emoji={Copy} onClick={onCopy} label={t("copy")} />
+                    ) : (
+                      <BaseMessageEmojiButton emoji={Check} />
+                    )}
+                    <BaseMessageEmojiButton emoji={ThumbsUp} checked={score === 1} onClick={handleThumbsUp} />
+                    <BaseMessageEmojiButton emoji={ThumbsDown} checked={score === -1} onClick={handleThumbsDown} />
+                  </>
+                )}
+              </MessageInlineEmojiRow>
+            )}
+          </Flex>
+        )}
+        {work_parameters && <WorkParametersDisplay parameters={work_parameters} />}
+      </PendingMessageEntry>
+      {state === "complete" && isAssistant && showEncourageMessage && (
+        <EncourageMessage
+          onThumbsUp={handleThumbsUp}
+          onThumbsDown={handleThumbsDown}
+          onClose={onEncourageMessageClose}
+        />
       )}
-      {work_parameters && <WorkParametersDisplay parameters={work_parameters} />}
-    </PendingMessageEntry>
+    </>
   );
 });
 
@@ -194,7 +206,7 @@ type PendingMessageEntryProps = {
   usedPlugin?: object;
 };
 
-const messageEntryContainerProps = {
+export const messageEntryContainerProps = {
   maxWidth: { base: "3xl", "2xl": "4xl" },
   w: "full",
 };
diff --git a/website/src/components/Chat/EncourageMessage.tsx b/website/src/components/Chat/EncourageMessage.tsx
index 097ffd908b..79974cf2d7 100644
--- a/website/src/components/Chat/EncourageMessage.tsx
+++ b/website/src/components/Chat/EncourageMessage.tsx
@@ -1,11 +1,66 @@
-import { Badge } from "@chakra-ui/react";
+import { Box, Button, ButtonProps, Card, Flex } from "@chakra-ui/react";
+import { ThumbsDown, ThumbsUp, X } from "lucide-react";
 import { useTranslation } from "next-i18next";
-// kept brief so that it doesnt distract/interfere with user experience
-export const EncourageMessage = () => {
+
+import { messageEntryContainerProps } from "./ChatMessageEntry";
+
+export const EncourageMessage = ({
+  onClose,
+  onThumbsDown,
+  onThumbsUp,
+}: {
+  onThumbsUp: () => void;
+  onThumbsDown: () => void;
+  onClose: () => void;
+}) => {
   const { t } = useTranslation("chat");
+
   return (
-    <Badge fontWeight="normal" background="gray.300" color="black">
-      {t("feedback_message")}
-    </Badge>
+    <Box {...messageEntryContainerProps}>
+      <Card
+        fontWeight="normal"
+        p="4"
+        flexDirection="row"
+        gap="2"
+        alignItems="center"
+        justifyContent={{ base: "center", lg: "space-between" }}
+        flexWrap="wrap"
+        textAlign="center"
+        w="fit-content"
+        ms={{
+          md: "38px",
+        }}
+        borderRadius="2xl"
+      >
+        {t("feedback_message")}
+        <Flex>
+          <FeedBackButton
+            leftIcon={<ThumbsUp size="20px" />}
+            onClick={() => {
+              onThumbsUp();
+              onClose();
+            }}
+          >
+            {t("feedback_action_great")}
+          </FeedBackButton>
+          <FeedBackButton
+            leftIcon={<ThumbsDown size="20px" />}
+            onClick={() => {
+              onThumbsDown();
+              onClose();
+            }}
+          >
+            {t("feedback_action_poor")}
+          </FeedBackButton>
+          <FeedBackButton p="2" onClick={onClose}>
+            <X size="20px" />
+          </FeedBackButton>
+        </Flex>
+      </Card>
+    </Box>
   );
 };
+
+const FeedBackButton = (props: ButtonProps) => {
+  return <Button variant="ghost" py="2" px="3" borderRadius="xl" {...props}></Button>;
+};