diff --git a/client/src/views/modals/compose-email.js b/client/src/views/modals/compose-email.js
index 4728a832ef..23ae2cf3ec 100644
--- a/client/src/views/modals/compose-email.js
+++ b/client/src/views/modals/compose-email.js
@@ -292,11 +292,10 @@ class ComposeEmailModalView extends EditModalView {
 
     beforeCollapse() {
         if (this.wasModified) {
-            this.actionSaveDraft({skipNotModifiedWarning: true});
+            this.actionSaveDraft({skipNotModifiedWarning: true})
+                .then(() => this.getRecordView().setConfirmLeaveOut(false));
         }
 
-        this.getRecordView().setConfirmLeaveOut(false);
-
         return super.beforeCollapse();
     }
 }