diff --git a/src/components/draft/draft.js b/src/components/draft/draft.js
index 90497139b..22a10b2e6 100644
--- a/src/components/draft/draft.js
+++ b/src/components/draft/draft.js
@@ -34,9 +34,7 @@ const Draft = {
   },
   data() {
     return {
-      referenceDraft: cloneDeep(this.draft),
       editing: false,
-      showingForm: false,
       showingConfirmDialog: false,
     }
   },
@@ -52,14 +50,6 @@ const Draft = {
         return {}
       }
     },
-    safeToSave() {
-      return Boolean(
-        this.draft.status ||
-        this.draft.files?.length ||
-        this.draft.hasPoll ||
-        this.draft.hasQuote
-      )
-    },
     postStatusFormProps() {
       return {
         draftId: this.draft.id,
@@ -71,15 +61,12 @@ const Draft = {
         ? useStatusesStore().allStatuses.get(this.draft.refId)
         : undefined
     },
-    localCollapseSubjectDefault() {
-      return useMergedConfigStore().mergedConfig.collapseMessageWithSubject
-    },
   },
   watch: {
     editing(newVal) {
-      this.showingForm = true
       if (newVal) return
-      this.showingForm = false
+      // (Post|Edit)StatusForm handles draft saving
+      this.$refs.form.saveDraft()
     },
   },
   methods: {
diff --git a/src/components/draft/draft.vue b/src/components/draft/draft.vue
index 1fc0294e6..5302a3ab3 100644
--- a/src/components/draft/draft.vue
+++ b/src/components/draft/draft.vue
@@ -64,16 +64,16 @@
         </div>
       </div>
     </div>
-    <div v-if="showingForm">
+    <div v-if="editing">
       <PostStatusForm
         v-if="draft.type !== 'edit'"
-        ref="postStatusForm"
+        ref="form"
         :hide-draft="true"
         v-bind="postStatusFormProps"
       />
       <EditStatusForm
         v-else
-        ref="editStatusForm"
+        ref="form"
         :hide-draft="true"
         :params="postStatusFormProps"
       />
diff --git a/src/components/edit_status_form/edit_status_form.js b/src/components/edit_status_form/edit_status_form.js
index 30bb98590..0121d4597 100644
--- a/src/components/edit_status_form/edit_status_form.js
+++ b/src/components/edit_status_form/edit_status_form.js
@@ -15,6 +15,9 @@ const EditStatusForm = {
     requestClose() {
       this.$refs.postStatusForm.requestClose()
     },
+    saveDraft() {
+      this.$refs.postStatusForm.saveDraft()
+    },
     doEditStatus({ status, spoilerText, sensitive, media, contentType, poll }) {
       const params = {
         statusId: this.params.statusId,