diff --git a/client/src/views/modals/compose-email.js b/client/src/views/modals/compose-email.js
index 036c52397f..f0f43a55af 100644
--- a/client/src/views/modals/compose-email.js
+++ b/client/src/views/modals/compose-email.js
@@ -300,7 +300,10 @@ class ComposeEmailModalView extends EditModalView {
     beforeCollapse() {
         if (this.wasModified) {
             this.actionSaveDraft({skipNotModifiedWarning: true})
-                .then(() => this.getRecordView().setConfirmLeaveOut(false));
+                .then(() => {
+                    this.getRecordView().setConfirmLeaveOut(false);
+                    this.getRouter().removeWindowLeaveOutObject(this);
+                });
         }
 
         return super.beforeCollapse();