diff --git a/src/components/draft/draft.js b/src/components/draft/draft.js
index fac5790aa..b048782f1 100644
--- a/src/components/draft/draft.js
+++ b/src/components/draft/draft.js
@@ -42,7 +42,9 @@ const Draft = {
       if (this.draft.type === 'edit') {
         return { statusId: this.draft.refId }
       } else if (this.draft.type === 'reply') {
-        return { replyTo: this.draft.refId }
+        return {
+          repliedStatus: this.refStatus
+        }
       } else {
         return {}
       }
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index ab1696eec..162540c08 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -983,8 +983,15 @@ const PostStatusForm = {
     saveDraft() {
       if (!this.disableDraft && !this.saveInhibited) {
         if (this.safeToSaveDraft) {
-          return this.$store
-            .dispatch('addOrSaveDraft', { draft: this.newStatus })
+          return this
+            .$store
+            .dispatch('addOrSaveDraft', {
+              draft: {
+                type: this.statusType,
+                refId: this.refId,
+                ...this.newStatus
+              }
+            })
             .then((id) => {
               if (this.newStatus.id !== id) {
                 this.newStatus.id = id
@@ -1016,7 +1023,7 @@ const PostStatusForm = {
       }
     },
     abandonDraft() {
-      return this.$store.dispatch('abandonDraft', { id: this.newStatus.id })
+      return this.$store.dispatch('abandonDraft', { id: this.draftId })
     },
     getDraft() {
       const maybeDraft = this.$store.state.drafts.drafts[this.draftId]
diff --git a/src/components/post_status_form/post_status_form.scss b/src/components/post_status_form/post_status_form.scss
index 31da7b933..2b00dd1f4 100644
--- a/src/components/post_status_form/post_status_form.scss
+++ b/src/components/post_status_form/post_status_form.scss
@@ -272,8 +272,7 @@
 
   .drop-indicator {
     position: absolute;
-    width: 100%;
-    height: 100%;
+    inset: 0;
     font-size: 5em;
     display: flex;
     align-items: center;