diff --git a/app/views/chats/index.html.erb b/app/views/chats/index.html.erb
index 1225f3fbc..801865e31 100644
--- a/app/views/chats/index.html.erb
+++ b/app/views/chats/index.html.erb
@@ -1,4 +1,4 @@
-<div data-controller="chat hotkey">
+<div data-controller="chat hotkey" class="h-full">
   <%= turbo_frame_tag chat_frame do %>
     <div class="flex flex-col h-full md:p-4">
       <% if show_demo_warning? %>
diff --git a/app/views/chats/show.html.erb b/app/views/chats/show.html.erb
index f9b170dbe..496d4ac65 100644
--- a/app/views/chats/show.html.erb
+++ b/app/views/chats/show.html.erb
@@ -15,7 +15,7 @@
         <% end %>
       </div>
 
-      <div id="messages" class="grow overflow-y-auto p-4 space-y-6 pb-24 lg:pb-4" data-chat-target="messages">
+      <div id="messages" class="grow overflow-y-auto p-4 space-y-6 lg:pb-4" data-chat-target="messages">
         <% if @chat.conversation_messages.any? %>
           <% @chat.conversation_messages.ordered.each do |message| %>
             <%= render message %>
@@ -36,7 +36,7 @@
       </div>
 
       <%# DESKTOP - Chat form %>
-      <div class="p-4 pt-0 lg:mt-auto fixed lg:static left-0 bottom-16 w-full bg-surface">
+      <div class="px-4 pt-4 lg:pt-0 lg:mt-auto sticky lg:static left-0 bottom-0 w-full bg-surface">
         <%= render "messages/chat_form", chat: @chat %>
       </div>
     </div>