diff --git a/ee/tabby-ui/app/search/components/assistant-message-section.tsx b/ee/tabby-ui/app/search/components/assistant-message-section.tsx
index 940725f1be2c..7792cf05f7dd 100644
--- a/ee/tabby-ui/app/search/components/assistant-message-section.tsx
+++ b/ee/tabby-ui/app/search/components/assistant-message-section.tsx
@@ -329,27 +329,32 @@ export function AssistantMessageSection({
             {!isLoading && !isEditing && (
               <div className="mt-3 flex items-center justify-between text-sm">
                 <div className="flex items-center gap-x-3">
-                  {!isLoading &&
-                    !fetchingContextInfo &&
-                    isLastAssistantMessage && (
-                      <Button
-                        className="flex items-center gap-x-1 px-1 font-normal text-muted-foreground"
-                        variant="ghost"
-                        onClick={() => onRegenerateResponse(message.id)}
-                      >
-                        <IconRefresh />
-                        <p>Regenerate</p>
-                      </Button>
-                    )}
-                  {isDeletable && (
-                    <Button
-                      className="flex items-center gap-x-1 px-1 font-normal text-muted-foreground"
-                      variant="ghost"
-                      onClick={() => onDeleteMessage(message.id)}
-                    >
-                      <IconTrash />
-                      <p>Delete</p>
-                    </Button>
+                  {isThreadOwner && (
+                    <>
+                      {!isLoading &&
+                        !fetchingContextInfo &&
+                        isLastAssistantMessage && (
+                          <Button
+                            className="flex items-center gap-x-1 px-1 font-normal text-muted-foreground"
+                            variant="ghost"
+                            onClick={() => onRegenerateResponse(message.id)}
+                          >
+                            <IconRefresh />
+                            <p>Regenerate</p>
+                          </Button>
+                        )}
+
+                      {isDeletable && (
+                        <Button
+                          className="flex items-center gap-x-1 px-1 font-normal text-muted-foreground"
+                          variant="ghost"
+                          onClick={() => onDeleteMessage(message.id)}
+                        >
+                          <IconTrash />
+                          <p>Delete</p>
+                        </Button>
+                      )}
+                    </>
                   )}
                 </div>
                 <div className="flex items-center gap-x-3">
diff --git a/ee/tabby-ui/app/search/components/search.tsx b/ee/tabby-ui/app/search/components/search.tsx
index 434cbe9a2738..fdfdd5ae2afd 100644
--- a/ee/tabby-ui/app/search/components/search.tsx
+++ b/ee/tabby-ui/app/search/components/search.tsx
@@ -827,7 +827,11 @@ export function Search() {
                     : {}
                 )}
               >
-                <div className="flex items-center gap-4">
+                <div
+                  className={cn('absolute flex items-center gap-4 ', {
+                    '-top-10': isThreadOwner
+                  })}
+                >
                   {stopButtonVisible && (
                     <Button
                       className="bg-background"
@@ -853,21 +857,23 @@ export function Search() {
                     </Button>
                   )}
                 </div>
-                <div
-                  className={cn(
-                    'relative z-20 flex justify-center self-stretch px-4'
-                  )}
-                >
-                  <TextAreaSearch
-                    onSearch={onSubmitSearch}
-                    className="min-h-[5rem] lg:max-w-4xl"
-                    placeholder="Ask a follow up question"
-                    isLoading={isLoading}
-                    isFollowup
-                    contextInfo={contextInfoData?.contextInfo}
-                    fetchingContextInfo={fetchingContextInfo}
-                  />
-                </div>
+                {isThreadOwner && (
+                  <div
+                    className={cn(
+                      'relative z-20 flex justify-center self-stretch px-4'
+                    )}
+                  >
+                    <TextAreaSearch
+                      onSearch={onSubmitSearch}
+                      className="min-h-[5rem] lg:max-w-4xl"
+                      placeholder="Ask a follow up question"
+                      isLoading={isLoading}
+                      isFollowup
+                      contextInfo={contextInfoData?.contextInfo}
+                      fetchingContextInfo={fetchingContextInfo}
+                    />
+                  </div>
+                )}
               </div>
             </main>
           </ResizablePanel>