diff --git a/lib/generators/ruby_llm/chat_ui/templates/tailwind/views/messages/tool_calls/_default.html.erb.tt b/lib/generators/ruby_llm/chat_ui/templates/tailwind/views/messages/tool_calls/_default.html.erb.tt
index 912561e63..5a432305f 100644
--- a/lib/generators/ruby_llm/chat_ui/templates/tailwind/views/messages/tool_calls/_default.html.erb.tt
+++ b/lib/generators/ruby_llm/chat_ui/templates/tailwind/views/messages/tool_calls/_default.html.erb.tt
@@ -1,4 +1,4 @@
-<div id="<%= message_variable_name %>_<%%= message.id %>" class="w-full sm:w-auto my-5 space-y-3 rounded-md px-3 py-2 bg-gray-50 border border-gray-200">
+<div id="<%= message_variable_name %>_tool_call_<%%= tool_call.id %>" class="w-full sm:w-auto my-5 space-y-3 rounded-md px-3 py-2 bg-gray-50 border border-gray-200">
   <div>
     <span class="inline-block rounded px-2 py-0.5 text-xs font-medium bg-gray-200 text-gray-700">
       Tool Call
diff --git a/lib/generators/ruby_llm/chat_ui/templates/tailwind/views/messages/tool_results/_default.html.erb.tt b/lib/generators/ruby_llm/chat_ui/templates/tailwind/views/messages/tool_results/_default.html.erb.tt
index 6ae566d66..3f617683c 100644
--- a/lib/generators/ruby_llm/chat_ui/templates/tailwind/views/messages/tool_results/_default.html.erb.tt
+++ b/lib/generators/ruby_llm/chat_ui/templates/tailwind/views/messages/tool_results/_default.html.erb.tt
@@ -5,7 +5,7 @@
     title: "Tool Result Error",
     error_message: error_message %>
 <%% else %>
-  <div id="<%= message_variable_name %>_<%%= tool.id %>" class="w-full sm:w-auto my-5 space-y-3 rounded-md px-3 py-2 bg-gray-50 border border-gray-200">
+  <div id="<%= message_variable_name %>_tool_result_<%%= tool.id %>" class="w-full sm:w-auto my-5 space-y-3 rounded-md px-3 py-2 bg-gray-50 border border-gray-200">
     <div>
       <span class="inline-block rounded px-2 py-0.5 text-xs font-medium bg-gray-200 text-gray-700">
         Tool
diff --git a/lib/generators/ruby_llm/chat_ui/templates/views/messages/tool_calls/_default.html.erb.tt b/lib/generators/ruby_llm/chat_ui/templates/views/messages/tool_calls/_default.html.erb.tt
index 20371763f..873f8e1c0 100644
--- a/lib/generators/ruby_llm/chat_ui/templates/views/messages/tool_calls/_default.html.erb.tt
+++ b/lib/generators/ruby_llm/chat_ui/templates/views/messages/tool_calls/_default.html.erb.tt
@@ -1,4 +1,4 @@
-<div id="<%= message_variable_name %>_<%%= message.id %>" class="<%= message_variable_name %>"
+<div id="<%= message_variable_name %>_tool_call_<%%= tool_call.id %>" class="<%= message_variable_name %>"
      style="margin-bottom: 20px; padding: 10px; border-left: 3px solid #6b7280; background: #f9fafb;">
   <div style="font-weight: bold; margin-bottom: 5px;">Tool Call</div>
   <pre style="white-space: pre-wrap; margin: 0;"><%%= tool_call.name %>(<%%= tool_call.arguments.map { |k, v| "#{k}: #{v.inspect}" }.join(", ") %>)</pre>
diff --git a/lib/generators/ruby_llm/chat_ui/templates/views/messages/tool_results/_default.html.erb.tt b/lib/generators/ruby_llm/chat_ui/templates/views/messages/tool_results/_default.html.erb.tt
index c492ec235..3273620d5 100644
--- a/lib/generators/ruby_llm/chat_ui/templates/views/messages/tool_results/_default.html.erb.tt
+++ b/lib/generators/ruby_llm/chat_ui/templates/views/messages/tool_results/_default.html.erb.tt
@@ -5,7 +5,7 @@
     title: "Tool Result Error",
     error_message: error_message %>
 <%% else %>
-  <div id="<%= message_variable_name %>_<%%= tool.id %>" class="<%= message_variable_name %>"
+  <div id="<%= message_variable_name %>_tool_result_<%%= tool.id %>" class="<%= message_variable_name %>"
        style="margin-bottom: 20px; padding: 10px; border-left: 3px solid #6b7280; background: #f9fafb;">
     <div style="font-weight: bold; margin-bottom: 5px;">Tool</div>
     <pre style="white-space: pre-wrap; margin: 0;"><%%= tool.content.presence || "(no output)" %></pre>
diff --git a/lib/generators/ruby_llm/tool/templates/tool_call.html.erb.tt b/lib/generators/ruby_llm/tool/templates/tool_call.html.erb.tt
index 3b913fd29..0cf41eb4a 100644
--- a/lib/generators/ruby_llm/tool/templates/tool_call.html.erb.tt
+++ b/lib/generators/ruby_llm/tool/templates/tool_call.html.erb.tt
@@ -2,7 +2,7 @@
 <%% if tool_call_error.present? %>
   <%%= render "messages/error", message: message, title: "Tool Call Error", error_message: tool_call_error %>
 <%% else %>
-  <div id="message_<%%= message.id %>" class="message"
+  <div id="message_tool_call_<%%= tool_call.id %>" class="message"
        style="margin-bottom: 20px; padding: 10px; border-left: 3px solid #6b7280; background: #f9fafb;">
     <div style="font-weight: bold; margin-bottom: 5px;"><%= tool_display_name %> Call</div>
     <pre style="white-space: pre-wrap; margin: 0;"><%%= tool_call.name %>(<%%= tool_call.arguments.map { |k, v| "#{k}: #{v.inspect}" }.join(", ") %>)</pre>
diff --git a/lib/generators/ruby_llm/tool/templates/tool_result.html.erb.tt b/lib/generators/ruby_llm/tool/templates/tool_result.html.erb.tt
index e38eb0a06..f81e30f8a 100644
--- a/lib/generators/ruby_llm/tool/templates/tool_result.html.erb.tt
+++ b/lib/generators/ruby_llm/tool/templates/tool_result.html.erb.tt
@@ -2,7 +2,7 @@
 <%% if error_message.present? %>
   <%%= render "messages/error", message: tool, title: "Tool Result Error", error_message: error_message %>
 <%% else %>
-  <div id="message_<%%= tool.id %>" class="message"
+  <div id="message_tool_result_<%%= tool.id %>" class="message"
        style="margin-bottom: 20px; padding: 10px; border-left: 3px solid #6b7280; background: #f9fafb;">
     <div style="font-weight: bold; margin-bottom: 5px;"><%= tool_display_name %> Result</div>
     <pre style="white-space: pre-wrap; margin: 0;"><%%= tool.content.presence || "(no output)" %></pre>
diff --git a/spec/ruby_llm/generators/chat_ui_generator_spec.rb b/spec/ruby_llm/generators/chat_ui_generator_spec.rb
index 9367fc456..e816629b8 100644
--- a/spec/ruby_llm/generators/chat_ui_generator_spec.rb
+++ b/spec/ruby_llm/generators/chat_ui_generator_spec.rb
@@ -70,8 +70,11 @@ def expect_generated_view_set( # rubocop:disable Metrics/AbcSize
     tool_calls_partial = File.read(File.join(base_path, 'messages/_tool_calls.html.erb'))
     expect(tool_calls_partial).to include('message: message, tool_call: tool_call')
     expect(tool_calls_partial).to include('local_assigns[:message]')
+    tool_calls_default = File.read(File.join(base_path, 'messages/tool_calls/_default.html.erb'))
+    expect(tool_calls_default).to include('message_tool_call_<%= tool_call.id %>')
     tool_results_default = File.read(File.join(base_path, 'messages/tool_results/_default.html.erb'))
     expect(tool_results_default).to include('tool.tool_error_message')
+    expect(tool_results_default).to include('message_tool_result_<%= tool.id %>')
     chat_form = File.read(File.join(base_path, 'chats/_form.html.erb'))
     expect(chat_form).to include('@chat_models.map')
     expect(chat_form).to include('[model.label, model.id]')
diff --git a/spec/ruby_llm/generators/tool_generator_spec.rb b/spec/ruby_llm/generators/tool_generator_spec.rb
index 289ac8384..3a06c8ed8 100644
--- a/spec/ruby_llm/generators/tool_generator_spec.rb
+++ b/spec/ruby_llm/generators/tool_generator_spec.rb
@@ -52,6 +52,7 @@ def run_rails_generate(*args)
       expect(tool_call_partial).to include('message: message')
       expect(tool_call_partial).to include('Weather Call')
       expect(tool_call_partial).to include('tool_call.arguments.map')
+      expect(tool_call_partial).to include('message_tool_call_<%= tool_call.id %>')
       expect(tool_call_partial).not_to include('render "messages/tool_calls/default"')
       expect(tool_call_partial).not_to include('<%%')
 
@@ -59,6 +60,7 @@ def run_rails_generate(*args)
       expect(tool_result_partial).to include('tool.tool_error_message')
       expect(tool_result_partial).to include('Weather Result')
       expect(tool_result_partial).to include('tool.content.presence || "(no output)"')
+      expect(tool_result_partial).to include('message_tool_result_<%= tool.id %>')
       expect(tool_result_partial).not_to include('render "messages/tool_results/default", tool: tool')
       expect(tool_result_partial).not_to include('<%%')
     end