diff --git a/WriteFreely-MultiPlatform.xcodeproj/xcuserdata/angelo.xcuserdatad/xcschemes/xcschememanagement.plist b/WriteFreely-MultiPlatform.xcodeproj/xcuserdata/angelo.xcuserdatad/xcschemes/xcschememanagement.plist
index 2723ebe..6cd8075 100644
--- a/WriteFreely-MultiPlatform.xcodeproj/xcuserdata/angelo.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/WriteFreely-MultiPlatform.xcodeproj/xcuserdata/angelo.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>SchemeUserState</key>
 	<dict>
 		<key>WriteFreely-MultiPlatform (iOS).xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>1</integer>
 		</dict>
 		<key>WriteFreely-MultiPlatform (macOS).xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>0</integer>
 		</dict>
 	</dict>
 </dict>
 </plist>
diff --git a/iOS/PostEditor/PostEditorView.swift b/iOS/PostEditor/PostEditorView.swift
index 4cb30dd..ddf4d01 100644
--- a/iOS/PostEditor/PostEditorView.swift
+++ b/iOS/PostEditor/PostEditorView.swift
@@ -1,171 +1,173 @@
 import SwiftUI
 
 struct PostEditorView: View {
     @EnvironmentObject var model: WriteFreelyModel
 
     @ObservedObject var post: WFAPost
 
     var body: some View {
         VStack {
             switch post.appearance {
             case "sans":
                 TextField("Title (optional)", text: $post.title)
                     .font(.custom("OpenSans-Regular", size: 26, relativeTo: Font.TextStyle.largeTitle))
                     .onChange(of: post.title) { _ in
                         if post.status == PostStatus.published.rawValue {
                             post.status = PostStatus.edited.rawValue
                         }
                     }
                 ZStack(alignment: .topLeading) {
                     if post.body.count == 0 {
                         Text("Write...")
                             .foregroundColor(Color(UIColor.placeholderText))
                             .padding(.horizontal, 4)
                             .padding(.vertical, 8)
                             .font(.custom("OpenSans-Regular", size: 17, relativeTo: Font.TextStyle.body))
                     }
                     TextEditor(text: $post.body)
                         .font(.custom("OpenSans-Regular", size: 17, relativeTo: Font.TextStyle.body))
                         .onChange(of: post.body) { _ in
                             if post.status == PostStatus.published.rawValue {
                                 post.status = PostStatus.edited.rawValue
                             }
                     }
                 }
             case "wrap", "mono", "code":
                 TextField("Title (optional)", text: $post.title)
                     .font(.custom("Hack", size: 26, relativeTo: Font.TextStyle.largeTitle))
                     .onChange(of: post.title) { _ in
                         if post.status == PostStatus.published.rawValue {
                             post.status = PostStatus.edited.rawValue
                         }
                     }
                 ZStack(alignment: .topLeading) {
                     if post.body.count == 0 {
                         Text("Write...")
                             .foregroundColor(Color(UIColor.placeholderText))
                             .padding(.horizontal, 4)
                             .padding(.vertical, 8)
                             .font(.custom("Hack", size: 17, relativeTo: Font.TextStyle.body))
                     }
                     TextEditor(text: $post.body)
                         .font(.custom("Hack", size: 17, relativeTo: Font.TextStyle.body))
                         .onChange(of: post.body) { _ in
                             if post.status == PostStatus.published.rawValue {
                                 post.status = PostStatus.edited.rawValue
                             }
                     }
                 }
             default:
                 TextField("Title (optional)", text: $post.title)
                     .font(.custom("Lora", size: 26, relativeTo: Font.TextStyle.largeTitle))
                     .onChange(of: post.title) { _ in
                         if post.status == PostStatus.published.rawValue {
                             post.status = PostStatus.edited.rawValue
                         }
                     }
                 ZStack(alignment: .topLeading) {
                     if post.body.count == 0 {
                         Text("Write...")
                             .foregroundColor(Color(UIColor.placeholderText))
                             .padding(.horizontal, 4)
                             .padding(.vertical, 8)
                             .font(.custom("Lora", size: 17, relativeTo: Font.TextStyle.body))
                     }
                     TextEditor(text: $post.body)
                         .font(.custom("Lora", size: 17, relativeTo: Font.TextStyle.body))
                         .onChange(of: post.body) { _ in
                             if post.status == PostStatus.published.rawValue {
                                 post.status = PostStatus.edited.rawValue
                             }
                     }
                 }
             }
         }
         .navigationBarTitleDisplayMode(.inline)
         .padding()
         .toolbar {
             ToolbarItem(placement: .principal) {
                 PostEditorStatusToolbarView(post: post)
             }
             ToolbarItem(placement: .primaryAction) {
                 Button(action: {
                     publishPost()
                 }, label: {
                     Image(systemName: "paperplane")
                 })
                 .disabled(
                     post.status == PostStatus.published.rawValue ||
                         !model.account.isLoggedIn ||
                         !model.hasNetworkConnection
                 )
             }
         }
         .onChange(of: post.hasNewerRemoteCopy, perform: { _ in
             if post.status == PostStatus.edited.rawValue && !post.hasNewerRemoteCopy {
                 post.status = PostStatus.published.rawValue
             }
         })
         .onChange(of: post.status, perform: { _ in
-            if post.status != PostStatus.published.rawValue {
-                DispatchQueue.main.async {
-                    model.editor.setLastDraft(post)
-                }
+            if post.status == PostStatus.published.rawValue {
+                model.editor.clearLastDraft()
             } else {
-                DispatchQueue.main.async {
-                    model.editor.clearLastDraft()
-                }
+                model.editor.setLastDraft(post)
+            }
+        })
+        .onAppear(perform: {
+            if post.status != PostStatus.published.rawValue {
+                model.editor.setLastDraft(post)
             }
         })
         .onDisappear(perform: {
+            model.editor.clearLastDraft()
             if post.status != PostStatus.published.rawValue {
                 DispatchQueue.main.async {
                     LocalStorageManager().saveContext()
                 }
             }
         })
     }
 
     private func publishPost() {
         DispatchQueue.main.async {
             LocalStorageManager().saveContext()
             model.posts.loadCachedPosts()
             model.publish(post: post)
         }
         #if os(iOS)
         self.hideKeyboard()
         #endif
     }
 }
 
 struct PostEditorView_EmptyPostPreviews: PreviewProvider {
     static var previews: some View {
         let context = LocalStorageManager.persistentContainer.viewContext
         let testPost = WFAPost(context: context)
         testPost.createdDate = Date()
         testPost.appearance = "norm"
 
         let model = WriteFreelyModel()
 
         return PostEditorView(post: testPost)
             .environment(\.managedObjectContext, context)
             .environmentObject(model)
     }
 }
 
 struct PostEditorView_ExistingPostPreviews: PreviewProvider {
     static var previews: some View {
         let context = LocalStorageManager.persistentContainer.viewContext
         let testPost = WFAPost(context: context)
         testPost.title = "Test Post Title"
         testPost.body = "Here's some cool sample body text."
         testPost.createdDate = Date()
         testPost.appearance = "code"
 
         let model = WriteFreelyModel()
 
         return PostEditorView(post: testPost)
             .environment(\.managedObjectContext, context)
             .environmentObject(model)
     }
 }
diff --git a/macOS/PostEditor/PostEditorView.swift b/macOS/PostEditor/PostEditorView.swift
index 5ed58af..2f14732 100644
--- a/macOS/PostEditor/PostEditorView.swift
+++ b/macOS/PostEditor/PostEditorView.swift
@@ -1,190 +1,192 @@
 import SwiftUI
 
 struct PostEditorView: View {
     @EnvironmentObject var model: WriteFreelyModel
 
     @ObservedObject var post: WFAPost
     @State private var isHovering: Bool = false
 
     var body: some View {
         VStack {
             switch post.appearance {
             case "sans":
                 TextField("Title (optional)", text: $post.title)
                     .textFieldStyle(PlainTextFieldStyle())
                     .padding(.bottom)
                     .font(.custom("OpenSans-Regular", size: 26, relativeTo: Font.TextStyle.largeTitle))
                     .onChange(of: post.title) { _ in
                         if post.status == PostStatus.published.rawValue {
                             post.status = PostStatus.edited.rawValue
                         }
                     }
                 ZStack(alignment: .topLeading) {
                     if post.body.count == 0 {
                         Text("Write...")
                             .foregroundColor(Color(NSColor.placeholderTextColor))
                             .padding(.horizontal, 4)
                             .padding(.vertical, 2)
                             .font(.custom("OpenSans-Regular", size: 17, relativeTo: Font.TextStyle.body))
                     }
                     TextEditor(text: $post.body)
                         .font(.custom("OpenSans-Regular", size: 17, relativeTo: Font.TextStyle.body))
                         .opacity(post.body.count == 0 && !isHovering ? 0.0 : 1.0)
                         .onChange(of: post.body) { _ in
                             if post.status == PostStatus.published.rawValue {
                                 post.status = PostStatus.edited.rawValue
                             }
                         }
                         .onHover(perform: { hovering in
                             self.isHovering = hovering
                         })
                 }
                 .background(Color(NSColor.controlBackgroundColor))
             case "wrap", "mono", "code":
                 TextField("Title (optional)", text: $post.title)
                     .textFieldStyle(PlainTextFieldStyle())
                     .padding(.bottom)
                     .font(.custom("Hack", size: 26, relativeTo: Font.TextStyle.largeTitle))
                     .onChange(of: post.title) { _ in
                         if post.status == PostStatus.published.rawValue {
                             post.status = PostStatus.edited.rawValue
                         }
                     }
                 ZStack(alignment: .topLeading) {
                     if post.body.count == 0 {
                         Text("Write...")
                             .foregroundColor(Color(NSColor.placeholderTextColor))
                             .padding(.horizontal, 4)
                             .padding(.vertical, 2)
                             .font(.custom("Hack", size: 17, relativeTo: Font.TextStyle.body))
                     }
                     TextEditor(text: $post.body)
                         .font(.custom("Hack", size: 17, relativeTo: Font.TextStyle.body))
                         .opacity(post.body.count == 0 && !isHovering ? 0.0 : 1.0)
                         .onChange(of: post.body) { _ in
                             if post.status == PostStatus.published.rawValue {
                                 post.status = PostStatus.edited.rawValue
                             }
                         }
                         .onHover(perform: { hovering in
                             self.isHovering = hovering
                         })
                 }
                 .background(Color(NSColor.controlBackgroundColor))
             default:
                 TextField("Title (optional)", text: $post.title)
                     .textFieldStyle(PlainTextFieldStyle())
                     .padding(.bottom)
                     .font(.custom("Lora", size: 26, relativeTo: Font.TextStyle.largeTitle))
                     .onChange(of: post.title) { _ in
                         if post.status == PostStatus.published.rawValue {
                             post.status = PostStatus.edited.rawValue
                         }
                     }
                 ZStack(alignment: .topLeading) {
                     if post.body.count == 0 {
                         Text("Write...")
                             .foregroundColor(Color(NSColor.placeholderTextColor))
                             .padding(.horizontal, 4)
                             .padding(.vertical, 2)
                             .font(.custom("Lora", size: 17, relativeTo: Font.TextStyle.body))
                     }
                     TextEditor(text: $post.body)
                         .font(.custom("Lora", size: 17, relativeTo: Font.TextStyle.body))
                         .opacity(post.body.count == 0 && !isHovering ? 0.0 : 1.0)
                         .onChange(of: post.body) { _ in
                             if post.status == PostStatus.published.rawValue {
                                 post.status = PostStatus.edited.rawValue
                             }
                         }
                         .onHover(perform: { hovering in
                             self.isHovering = hovering
                         })
                 }
                 .background(Color(NSColor.controlBackgroundColor))
             }
         }
         .padding()
         .background(Color.white)
         .toolbar {
             ToolbarItem(placement: .status) {
                 PostEditorStatusToolbarView(post: post)
             }
             ToolbarItem(placement: .primaryAction) {
                 Button(action: {
                     publishPost()
                 }, label: {
                     Image(systemName: "paperplane")
                 })
                 .disabled(
                     post.status == PostStatus.published.rawValue ||
                         !model.account.isLoggedIn ||
                         !model.hasNetworkConnection
                 )
             }
         }
         .onChange(of: post.hasNewerRemoteCopy, perform: { _ in
             if post.status == PostStatus.edited.rawValue && !post.hasNewerRemoteCopy {
                 post.status = PostStatus.published.rawValue
             }
         })
         .onChange(of: post.status, perform: { _ in
+            if post.status == PostStatus.published.rawValue {
+                model.editor.clearLastDraft()
+            } else {
+                model.editor.setLastDraft(post)
+            }
+        })
+        .onAppear(perform: {
             if post.status != PostStatus.published.rawValue {
-                DispatchQueue.main.async {
-                    model.editor.setLastDraft(post)
-                }
+                model.editor.setLastDraft(post)
             }
         })
         .onDisappear(perform: {
+            model.editor.clearLastDraft()
             if post.status != PostStatus.published.rawValue {
                 DispatchQueue.main.async {
                     LocalStorageManager().saveContext()
                 }
-            } else {
-                DispatchQueue.main.async {
-                    model.editor.clearLastDraft()
-                }
             }
         })
     }
 
     private func publishPost() {
         DispatchQueue.main.async {
             LocalStorageManager().saveContext()
             model.posts.loadCachedPosts()
             model.publish(post: post)
         }
     }
 }
 
 struct PostEditorView_EmptyPostPreviews: PreviewProvider {
     static var previews: some View {
         let context = LocalStorageManager.persistentContainer.viewContext
         let testPost = WFAPost(context: context)
         testPost.createdDate = Date()
         testPost.appearance = "norm"
 
         let model = WriteFreelyModel()
 
         return PostEditorView(post: testPost)
             .environment(\.managedObjectContext, context)
             .environmentObject(model)
     }
 }
 
 struct PostEditorView_ExistingPostPreviews: PreviewProvider {
     static var previews: some View {
         let context = LocalStorageManager.persistentContainer.viewContext
         let testPost = WFAPost(context: context)
         testPost.title = "Test Post Title"
         testPost.body = "Here's some cool sample body text."
         testPost.createdDate = Date()
         testPost.appearance = "code"
 
         let model = WriteFreelyModel()
 
         return PostEditorView(post: testPost)
             .environment(\.managedObjectContext, context)
             .environmentObject(model)
     }
 }