diff --git a/app/views/bubbles/show.html.erb b/app/views/bubbles/show.html.erb
index ea600e72f..18126f584 100644
--- a/app/views/bubbles/show.html.erb
+++ b/app/views/bubbles/show.html.erb
@@ -101,15 +101,19 @@
     <% if @bubble.published? %>
       <%= render "bubbles/messages", bubble: @bubble %>
     <% else %>
-      <form data-controller="remote-auto-save" data-remote-auto-save-auto-save-outlet="#bubble_form">
-        <%= tag.house_md @bubble.draft_comment, name: "bubble[draft_comment]", form: "bubble_form", placeholder: new_comment_placeholder(@bubble),
-              data: { action: "house-md:change->remote-auto-save#change focusout->remote-auto-save#submit" } %>
-      </form>
+      <div class="comments">
+        <div class="comment comment--new border-radius flex align-start full-width margin-block-double">
+          <form data-controller="remote-auto-save" data-remote-auto-save-auto-save-outlet="#bubble_form" class="flex flex-column gap full-width">
+            <%= tag.house_md @bubble.draft_comment, name: "bubble[draft_comment]", class: "input comment__input", form: "bubble_form", placeholder: new_comment_placeholder(@bubble),
+                  data: { action: "house-md:change->remote-auto-save#change focusout->remote-auto-save#submit" } %>
+          </form>
+        </div>
+      </div>
     <% end %>
   </div>
 
   <% if @bubble.creating? %>
-    <div class="bubble__actions-container center border-radius pad flex align-center justify-space-between gap pad-inline-double" style="--bubble-color: <%= @bubble.color %>; margin-block-start: calc(var(--block-space) * -2);">
+    <div class="bubble__actions-container center border-radius pad flex align-center justify-space-between gap pad-inline-double" style="--bubble-color: <%= @bubble.color %>;">
       <%= button_to "Save as draft", bucket_bubble_path(@bubble.bucket, @bubble), name: "bubble[status]", value: "drafted", method: :put, class: "btn btn--plain borderless fill-transparent" %>
       <%= button_to "Create bubble", bucket_bubble_publish_path(@bubble.bucket, @bubble), class: "btn btn--reversed" %>
     </div>