diff --git a/Shared/Post/PostEditor.swift b/Shared/Post/PostEditor.swift
index 27807c0..aa2568b 100644
--- a/Shared/Post/PostEditor.swift
+++ b/Shared/Post/PostEditor.swift
@@ -1,60 +1,64 @@
 import SwiftUI
 
 struct PostEditor: View {
     @EnvironmentObject var postStore: PostStore
     @ObservedObject var post: Post
     @State private var isNewPost = false
 
     var body: some View {
         VStack {
             TextEditor(text: $post.title)
                 .font(.title)
                 .frame(height: 100)
                 .onChange(of: post.title) { _ in
                     if post.status == .published {
                         post.status = .edited
                     }
                 }
             TextEditor(text: $post.body)
                 .font(.body)
                 .onChange(of: post.body) { _ in
                     if post.status == .published {
                         post.status = .edited
                     }
                 }
         }
         .padding()
         .toolbar {
             ToolbarItem(placement: .status) {
                 PostStatusBadge(post: post)
             }
             ToolbarItem(placement: .primaryAction) {
                 Button(action: {
                     post.status = .published
                 }, label: {
                     Image(systemName: "paperplane")
                 })
             }
         }
-        .onAppear(perform: checkIfNewPost)
-        .onDisappear(perform: addPostToStore)
+        .onAppear(perform: {
+            checkIfNewPost()
+            if self.isNewPost {
+                addNewPostToStore()
+            }
+        })
     }
 
     private func checkIfNewPost() {
         self.isNewPost = !postStore.posts.contains(where: { $0.id == post.id })
     }
 
-    private func addPostToStore() {
-        if isNewPost {
-            withAnimation {
-                postStore.add(post)
-            }
+    private func addNewPostToStore() {
+        withAnimation {
+            postStore.add(post)
+            self.isNewPost = false
         }
     }
 }
+}
 
 struct PostEditor_Previews: PreviewProvider {
     static var previews: some View {
         PostEditor(post: testPost)
     }
 }