diff --git a/templates/index.html b/templates/index.html
index 2383bc0..841c5d8 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1202,11 +1202,11 @@ async function sendSearch() {
     const model = currentModel;
     const welcome = document.getElementById('welcomeScreen');
     if (welcome) welcome.remove();
-    appendMessage('user', '🔍 ' + query, true);
+    const userDiv = appendMessage('user', '🔍 ' + query, true);
     conversationHistory.push({ role: 'user', content: '🔍 ' + query });
     input.value = '';
     input.style.height = 'auto';
-    const assistantDiv = appendMessage('assistant', '', true, true, document.querySelector('.message.user'));
+    const assistantDiv = appendMessage('assistant', '', true, true, userDiv);
     const textEl = assistantDiv.querySelector('.text');
     textEl.innerHTML = '<div class="search-indicator"><div class="spinner"></div>Searching the web...</div>';
     setStreamingState(true);
@@ -1373,14 +1373,14 @@ async function sendMessage() {
     const model = currentModel;
     const welcome = document.getElementById('welcomeScreen');
     if (welcome) welcome.remove();
-    appendMessage('user', message, true);
+    const userDiv = appendMessage('user', message, true);
     conversationHistory.push({ role: 'user', content: message });
     messageHistory.push(message);
     if (messageHistory.length > 100) messageHistory.shift();
     historyIndex = -1;
     input.value = '';
     input.style.height = 'auto';
-    const assistantDiv = appendMessage('assistant', '', true, false, document.querySelector('.message.user'));
+    const assistantDiv = appendMessage('assistant', '', true, false, userDiv);
     const textEl = assistantDiv.querySelector('.text');
     textEl.innerHTML = '<div class="typing-indicator"><span></span><span></span><span></span></div>';
     setStreamingState(true);