diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserProfilePicture.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserProfilePicture.kt
index df856f55e..747b6c2e9 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserProfilePicture.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/UserProfilePicture.kt
@@ -483,7 +483,10 @@ fun NoteDropDownMenu(
 
     if (wantsToEditPost.value) {
         EditPostView(
-            onClose = { wantsToEditPost.value = false },
+            onClose = {
+                popupExpanded.value = false
+                wantsToEditPost.value = false
+            },
             edit = note,
             accountViewModel = accountViewModel,
             nav = nav,