diff --git a/app/views/chats/_chat.html.erb b/app/views/chats/_chat.html.erb
index fd904de1..1d8f57f6 100644
--- a/app/views/chats/_chat.html.erb
+++ b/app/views/chats/_chat.html.erb
@@ -2,7 +2,9 @@
 
 <%= tag.div class: "flex items-center justify-between px-4 py-3 bg-container shadow-border-xs rounded-lg" do %>
   <div class="grow">
-    <%= render "chats/chat_title", chat: chat, ctx: "list" %>
+    <%= turbo_frame_tag dom_id(chat, :title) do %>
+      <%= render "chats/chat_title", chat: chat, ctx: "list" %>
+    <% end %>
 
     <p class="text-sm text-secondary">
       <%= time_ago_in_words(chat.updated_at) %> ago
@@ -10,7 +12,13 @@
   </div>
 
   <%= render MenuComponent.new(icon_vertical: true) do |menu| %>
-    <% menu.with_item(variant: "link", text: "Edit chat", href: edit_chat_path(chat), icon: "pencil", frame: dom_id(chat, "title")) %>
+    <% menu.with_item(
+      variant: "link", 
+      text: "Edit chat title", 
+      href: edit_chat_path(chat, ctx: "list"), 
+      icon: "pencil", 
+      data: { turbo_frame: dom_id(chat, "title") }) %>
+      
     <% menu.with_item(
       variant: "button",
       text: "Delete chat",
diff --git a/app/views/chats/_chat_nav.html.erb b/app/views/chats/_chat_nav.html.erb
index 5f4d44b5..8b1c00ae 100644
--- a/app/views/chats/_chat_nav.html.erb
+++ b/app/views/chats/_chat_nav.html.erb
@@ -27,7 +27,7 @@
         text: "Edit chat title",
         href: edit_chat_path(chat, ctx: "chat"),
         icon: "pencil",
-        frame: dom_id(chat, "title")) %>
+        data: { turbo_frame: dom_id(chat, "title") }) %>
 
       <% menu.with_item(
         variant: "button",
diff --git a/app/views/chats/edit.html.erb b/app/views/chats/edit.html.erb
index a7fa70ae..cb821576 100644
--- a/app/views/chats/edit.html.erb
+++ b/app/views/chats/edit.html.erb
@@ -1,8 +1,9 @@
 <%= turbo_frame_tag dom_id(@chat, :title), class: "block" do %>
-  <% bg_class = params[:ctx] == "chat" ? "bg-container" : "bg-container-inset" %>
-  <%= styled_form_with model: @chat,
-                       class: class_names("p-1 rounded-md font-medium text-primary w-full", bg_class),
-                       data: { controller: "auto-submit-form", auto_submit_form_trigger_event_value: "blur" } do |f| %>
-    <%= f.text_field :title, data: { auto_submit_form_target: "auto" }, inline: true %>
+  <%= styled_form_with model: @chat, data: { controller: "auto-submit-form", auto_submit_form_trigger_event_value: "blur" } do |f| %>
+    <%= f.text_field :title,
+      data: { auto_submit_form_target: "auto" },
+      autofocus: true,
+      inline: true,
+      class: "w-full rounded-md px-2 py-1 text-sm font-medium bg-container-inset" %>
   <% end %>
 <% end %>