diff --git a/app/javascript/controllers/remote_auto_save_controller.js b/app/javascript/controllers/remote_auto_save_controller.js
new file mode 100644
index 000000000..7ba4a6d5e
--- /dev/null
+++ b/app/javascript/controllers/remote_auto_save_controller.js
@@ -0,0 +1,13 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  static outlets = [ "auto-save" ]
+
+  change(event) {
+    this.autoSaveOutlet.change(event)
+  }
+
+  submit() {
+    this.autoSaveOutlet.submit()
+  }
+}
diff --git a/app/views/bubbles/show.html.erb b/app/views/bubbles/show.html.erb
index 184c432e3..ea600e72f 100644
--- a/app/views/bubbles/show.html.erb
+++ b/app/views/bubbles/show.html.erb
@@ -101,8 +101,9 @@
     <% if @bubble.published? %>
       <%= render "bubbles/messages", bubble: @bubble %>
     <% else %>
-      <form>
-      <%= tag.house_md @bubble.draft_comment, name: "bubble[draft_comment]", form: "bubble_form", placeholder: new_comment_placeholder(@bubble) %>
+      <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>
     <% end %>
   </div>