diff --git a/src/interface/web/app/share/chat/page.tsx b/src/interface/web/app/share/chat/page.tsx
index 3e00afb8..b9b51966 100644
--- a/src/interface/web/app/share/chat/page.tsx
+++ b/src/interface/web/app/share/chat/page.tsx
@@ -79,36 +79,38 @@ function ChatBodyData(props: ChatBodyDataProps) {
     }
 
     return (
-        <>
-            <div className={false ? styles.chatBody : styles.chatBodyFull}>
-                <ChatHistory
-                    publicConversationSlug={props.publicConversationSlug}
-                    conversationId={props.conversationId || ""}
-                    setAgent={setAgentMetadata}
-                    setTitle={props.setTitle}
-                    pendingMessage={processingMessage ? message : ""}
-                    incomingMessages={props.streamedMessages}
-                    customClassName={chatHistoryCustomClassName}
-                />
+        <div className="flex flex-row h-full w-full">
+            <div className="flex flex-col h-full w-full">
+                <div className={false ? styles.chatBody : styles.chatBodyFull}>
+                    <ChatHistory
+                        publicConversationSlug={props.publicConversationSlug}
+                        conversationId={props.conversationId || ""}
+                        setAgent={setAgentMetadata}
+                        setTitle={props.setTitle}
+                        pendingMessage={processingMessage ? message : ""}
+                        incomingMessages={props.streamedMessages}
+                        customClassName={chatHistoryCustomClassName}
+                    />
+                </div>
+                <div
+                    className={`${styles.inputBox} p-1 md:px-2 shadow-md bg-background align-middle items-center justify-center dark:bg-neutral-700 dark:border-0 dark:shadow-sm rounded-2xl md:rounded-xl h-fit ${chatHistoryCustomClassName} mr-auto ml-auto mt-auto`}
+                >
+                    <ChatInputArea
+                        isLoggedIn={props.isLoggedIn}
+                        sendMessage={(message) => setMessage(message)}
+                        sendImage={(image) => setImages((prevImages) => [...prevImages, image])}
+                        sendDisabled={processingMessage}
+                        chatOptionsData={props.chatOptionsData}
+                        conversationId={props.conversationId}
+                        agentColor={agentMetadata?.color}
+                        isMobileWidth={props.isMobileWidth}
+                        setUploadedFiles={props.setUploadedFiles}
+                        setTriggeredAbort={() => { }}
+                        ref={chatInputRef}
+                    />
+                </div>
             </div>
-            <div
-                className={`${styles.inputBox} p-1 md:px-2 shadow-md bg-background align-middle items-center justify-center dark:bg-neutral-700 dark:border-0 dark:shadow-sm rounded-2xl md:rounded-xl h-fit ${chatHistoryCustomClassName} mr-auto ml-auto`}
-            >
-                <ChatInputArea
-                    isLoggedIn={props.isLoggedIn}
-                    sendMessage={(message) => setMessage(message)}
-                    sendImage={(image) => setImages((prevImages) => [...prevImages, image])}
-                    sendDisabled={processingMessage}
-                    chatOptionsData={props.chatOptionsData}
-                    conversationId={props.conversationId}
-                    agentColor={agentMetadata?.color}
-                    isMobileWidth={props.isMobileWidth}
-                    setUploadedFiles={props.setUploadedFiles}
-                    setTriggeredAbort={() => {}}
-                    ref={chatInputRef}
-                />
-            </div>
-        </>
+        </div>
     );
 }
 
diff --git a/src/interface/web/app/share/chat/sharedChat.module.css b/src/interface/web/app/share/chat/sharedChat.module.css
index 844834f3..d147502b 100644
--- a/src/interface/web/app/share/chat/sharedChat.module.css
+++ b/src/interface/web/app/share/chat/sharedChat.module.css
@@ -35,6 +35,7 @@ div.inputBox:focus {
 div.chatBodyFull {
     display: grid;
     grid-template-columns: 1fr;
+    height: auto;
 }
 
 button.inputBox {
diff --git a/src/khoj/routers/api_chat.py b/src/khoj/routers/api_chat.py
index 5f4d1821..0bd9cca0 100644
--- a/src/khoj/routers/api_chat.py
+++ b/src/khoj/routers/api_chat.py
@@ -280,8 +280,20 @@ def get_shared_chat(
 
     agent_metadata = None
     if conversation.agent:
-        if conversation.agent.privacy_level == Agent.PrivacyLevel.PRIVATE:
-            conversation.agent = None
+        if conversation.agent.privacy_level == Agent.PrivacyLevel.PRIVATE and conversation.agent.creator != user:
+            if conversation.agent.is_hidden:
+                default_agent = AgentAdapters.get_default_agent()
+                agent_metadata = {
+                    "slug": default_agent.slug,
+                    "name": default_agent.name,
+                    "is_creator": False,
+                    "color": default_agent.style_color,
+                    "icon": default_agent.style_icon,
+                    "persona": default_agent.personality,
+                    "is_hidden": default_agent.is_hidden,
+                }
+            else:
+                conversation.agent = None
         else:
             agent_metadata = {
                 "slug": conversation.agent.slug,