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