diff --git a/src/components/NewMessageModal.vue b/src/components/NewMessageModal.vue
index 70bf666100..0cf4437ad9 100644
--- a/src/components/NewMessageModal.vue
+++ b/src/components/NewMessageModal.vue
@@ -269,6 +269,10 @@ export default {
 		this.updateCookedComposerData()
 		await this.openModalSize()
 		window.addEventListener('resize', this.checkScreenSize)
+
+		if (this.composerData.draftId !== undefined) {
+			this.onDraft(this.cookedComposerData, { showToast: false })
+		}
 	},
 
 	beforeUnmount() {