diff --git a/app/views/comments/edit.html.erb b/app/views/comments/edit.html.erb
index a4ecf07df..b68d43122 100644
--- a/app/views/comments/edit.html.erb
+++ b/app/views/comments/edit.html.erb
@@ -2,7 +2,7 @@
   <div class="comment__content flex-inline flex-column full-width border border-radius" style="background-color: var(--color-selected);">
     <%= form_with model: [@bubble.bucket, @bubble, @comment], class: "flex flex-column gap full-width",
           data: { controller: "form", action: "keydown.ctrl+enter->form#submit:prevent keydown.meta+enter->form#submit:prevent keydown.esc->form#cancel" } do |form| %>
-      <%= form.text_area :body, class: "input comment__input", required: true, rows: 3 %>
+      <%= form.markdown_area :body, class: "input comment__input", required: true %>
       <div class="flex gap-half justify-start">
         <%= form.button class: "btn btn--reversed txt-small", type: :submit do %>
           <%= image_tag "check.svg", aria: { hidden: true }, size: 16 %>
diff --git a/app/views/comments/show.html.erb b/app/views/comments/show.html.erb
index 94f7362af..eae7ba080 100644
--- a/app/views/comments/show.html.erb
+++ b/app/views/comments/show.html.erb
@@ -16,7 +16,7 @@
       <% end %>
     </div>
     <div class="comment__body txt-align-start">
-      <%= simple_format @comment.body %>
+      <%= sanitize @comment.body_html %>
     </div>
   </div>
 <% end %>