diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteQuickActionMenu.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteQuickActionMenu.kt
index a818abcfe..0f535fdc3 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteQuickActionMenu.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteQuickActionMenu.kt
@@ -206,6 +206,7 @@ fun NoteQuickActionMenu(
     if (editDraftDialog.value) {
         NewPostView(
             onClose = {
+                onDismiss()
                 editDraftDialog.value = false
             },
             accountViewModel = accountViewModel,
@@ -427,7 +428,6 @@ private fun RenderMainPopup(
                             Icons.Default.Edit,
                             stringRes(R.string.edit_draft),
                         ) {
-                            onDismiss()
                             onWantsToEditDraft()
                         }
                     } else {