diff --git a/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte b/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte
index b7f3e8c5..c3dfead5 100644
--- a/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte
+++ b/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte
@@ -214,14 +214,14 @@
 	let isHandlingQueue = $state(false);
 	let isStopStreamClicked = $state(false);
 
-	// let loadEditor = $derived(!isSendingMsg && !isThinking && loadTextEditor && messageQueue.length === 0);
+	let isWaiting = $derived(isSendingMsg || isThinking || messageQueue.length > 0);
 	let loadEditor = true;
 	let disableAction = $derived(!ADMIN_ROLES.includes(currentUser?.role || '')
 								&& currentUser?.id !== conversationUser?.id
 								|| !AgentExtensions.chatable(agent));
 
 	$effect(() => {
-		if (loadEditor) {
+		if (!isWaiting && !disableAction) {
 			focusChatTextArea();
 		}
 	});
@@ -280,8 +280,6 @@
 				handleChatAction(e);
 			}
 		});
-
-		await focusChatTextArea();
 	});
 
 	function handleLogoutAction() {
diff --git a/src/routes/chat/[agentId]/[conversationId]/rich-content/rc-embedding.svelte b/src/routes/chat/[agentId]/[conversationId]/rich-content/rc-embedding.svelte
index 7b40a032..96627526 100644
--- a/src/routes/chat/[agentId]/[conversationId]/rich-content/rc-embedding.svelte
+++ b/src/routes/chat/[agentId]/[conversationId]/rich-content/rc-embedding.svelte
@@ -1,6 +1,10 @@
 <script>
+    import { getContext } from 'svelte';
     import collapse from 'svelte-collapse';
 
+    const collapseDuration = 0.3;
+    const { autoScrollToBottom } = getContext('chat-window-context');
+
     /**
      * @type {{
      *   url?: string,
@@ -18,6 +22,9 @@
 
     function toggleCollapse() {
         open = !open;
+        if (open) {
+            setTimeout(() => autoScrollToBottom?.(), collapseDuration * 1000);
+        }
     }
 </script>
 
@@ -31,19 +38,22 @@
                 <i class="bx bx-link-external"></i>
             </a>
         </div>
-        <div use:collapse={{ open, duration: 0.3, easing: 'ease' }} style="width: 100%; margin-top: 8px;">
+        <div use:collapse={{ open, duration: collapseDuration, easing: 'ease' }} style="width: 100%; margin-top: 8px;">
+            {#if open}
             <div class="rc-embedding-container">
                 {#if htmlTag === 'iframe'}
                     <iframe
+                        class="rc-embedding-iframe"
                         src={url}
                         title={title || ''}
                         frameborder="0"
                         allowfullscreen
+                        referrerpolicy="no-referrer"
                         sandbox="allow-scripts allow-same-origin allow-popups allow-forms"
-                        class="rc-embedding-iframe"
                     ></iframe>
                 {/if}
             </div>
+            {/if}
         </div>
     </div>
 {/if}