diff --git a/assets/javascripts/discourse/components/modal/post-event-builder.hbs b/assets/javascripts/discourse/components/modal/post-event-builder.hbs
index 8db863c13..c18b0c75f 100644
--- a/assets/javascripts/discourse/components/modal/post-event-builder.hbs
+++ b/assets/javascripts/discourse/components/modal/post-event-builder.hbs
@@ -123,7 +123,7 @@
           <GroupSelector
             @fullWidthWrap={{true}}
             @groupFinder={{this.groupFinder}}
-            @groupNames={{@model.event.raw_invitees}}
+            @groupNames={{@model.event.rawInvitees}}
             @onChangeCallback={{this.setRawInvitees}}
             @placeholderKey="topic.invite_private.group_name"
           />
@@ -232,7 +232,7 @@
               <Input
                 class="custom-field-input"
                 @value={{readonly
-                  (get @model.event.custom_fields allowedCustomField)
+                  (get @model.event.customFields allowedCustomField)
                 }}
                 placeholder={{i18n
                   "discourse_post_event.builder_modal.custom_fields.placeholder"
diff --git a/assets/javascripts/discourse/components/modal/post-event-builder.js b/assets/javascripts/discourse/components/modal/post-event-builder.js
index b65d8a1e3..8180c2724 100644
--- a/assets/javascripts/discourse/components/modal/post-event-builder.js
+++ b/assets/javascripts/discourse/components/modal/post-event-builder.js
@@ -146,7 +146,7 @@ export default class PostEventBuilder extends Component {
 
   @action
   setCustomField(field, e) {
-    this.event[field] = e.target.value;
+    this.event.customFields[field] = e.target.value;
   }
 
   @action
diff --git a/assets/javascripts/discourse/models/discourse-post-event-event.js b/assets/javascripts/discourse/models/discourse-post-event-event.js
index 9083a6ec0..2384440bd 100644
--- a/assets/javascripts/discourse/models/discourse-post-event-event.js
+++ b/assets/javascripts/discourse/models/discourse-post-event-event.js
@@ -26,6 +26,7 @@ export default class DiscoursePostEventEvent {
   @tracked rawInvitees;
   @tracked url;
   @tracked timezone;
+  @tracked status;
   @tracked post;
   @tracked minimal;
   @tracked canUpdateAttendance;
diff --git a/spec/system/post_event_spec.rb b/spec/system/post_event_spec.rb
index 2f292addf..14ee4079c 100644
--- a/spec/system/post_event_spec.rb
+++ b/spec/system/post_event_spec.rb
@@ -3,11 +3,13 @@
 describe "Post event", type: :system do
   fab!(:admin)
   fab!(:user) { Fabricate(:admin, username: "jane") }
+  fab!(:group) { Fabricate(:group, name: "test_group") }
   let(:composer) { PageObjects::Components::Composer.new }
 
   before do
     SiteSetting.calendar_enabled = true
     SiteSetting.discourse_post_event_enabled = true
+    SiteSetting.discourse_post_event_allowed_custom_fields = "custom"
     sign_in(admin)
   end
 
@@ -68,4 +70,35 @@
 
     expect(event.invitees.count).to eq(2)
   end
+
+  it "can update fields and invitees and they are kept when re-opening" do
+    visit "/new-topic"
+    title = "Test event with updates"
+
+    composer.fill_title(title)
+
+    page.find(".toolbar-popup-menu-options .dropdown-select-box-header").click
+
+    page.find(
+      ".toolbar-popup-menu-options [data-name='#{I18n.t("js.discourse_post_event.builder_modal.attach")}']",
+    ).click
+
+    page.find(".d-modal input[name=status][value=private]").click
+
+    page.find(".d-modal input.group-selector").fill_in(with: "test_")
+    page.find(".autocomplete.ac-group").click
+
+    page.find(".d-modal .custom-field-input").fill_in(with: "custom value")
+
+    page.find(".d-modal .btn-primary").click
+
+    composer.submit
+
+    page.find(".discourse-post-event-more-menu-trigger").click
+    page.find(".edit-event").click
+
+    expect(page.find(".d-modal input[name=status][value=private]").checked?).to eq(true)
+    expect(page.find(".d-modal")).to have_text("test_group")
+    expect(page.find(".d-modal .custom-field-input").value).to eq("custom value")
+  end
 end