diff --git a/src/components/edit_status_form/edit_status_form.js b/src/components/edit_status_form/edit_status_form.js
index 9a0bcc0e..32376337 100644
--- a/src/components/edit_status_form/edit_status_form.js
+++ b/src/components/edit_status_form/edit_status_form.js
@@ -12,6 +12,9 @@ const EditStatusForm = {
     }
   },
   methods: {
+    requestClose () {
+      this.$refs.postStatusForm.requestClose()
+    },
     doEditStatus ({ status, spoilerText, sensitive, media, contentType, poll }) {
       const params = {
         store: this.$store,
diff --git a/src/components/edit_status_form/edit_status_form.vue b/src/components/edit_status_form/edit_status_form.vue
index eee2d39a..0a7ec760 100644
--- a/src/components/edit_status_form/edit_status_form.vue
+++ b/src/components/edit_status_form/edit_status_form.vue
@@ -1,5 +1,6 @@
 <template>
   <PostStatusForm
+    ref="postStatusForm"
     v-bind="params"
     :post-handler="doEditStatus"
     :disable-polls="true"
diff --git a/src/components/edit_status_modal/edit_status_modal.js b/src/components/edit_status_modal/edit_status_modal.js
index 90964c95..0de2e53c 100644
--- a/src/components/edit_status_modal/edit_status_modal.js
+++ b/src/components/edit_status_modal/edit_status_modal.js
@@ -43,6 +43,9 @@ const EditStatusModal = {
   },
   methods: {
     closeModal () {
+      this.$refs.editStatusForm.requestClose()
+    },
+    doCloseModal () {
       this.$store.dispatch('closeEditStatusModal')
     }
   }
diff --git a/src/components/edit_status_modal/edit_status_modal.vue b/src/components/edit_status_modal/edit_status_modal.vue
index 96d05343..9acbaaee 100644
--- a/src/components/edit_status_modal/edit_status_modal.vue
+++ b/src/components/edit_status_modal/edit_status_modal.vue
@@ -9,9 +9,11 @@
         {{ $t('post_status.edit_status') }}
       </div>
       <EditStatusForm
+        ref="editStatusForm"
         class="panel-body"
         :params="params"
-        @posted="closeModal"
+        @posted="doCloseModal"
+        @can-close="doCloseModal"
       />
     </div>
   </Modal>