diff --git a/Shared/Navigation/ContentView.swift b/Shared/Navigation/ContentView.swift
index 86fbbeb..2052aad 100644
--- a/Shared/Navigation/ContentView.swift
+++ b/Shared/Navigation/ContentView.swift
@@ -1,71 +1,71 @@
 import SwiftUI
 
 struct ContentView: View {
     @EnvironmentObject var model: WriteFreelyModel
 
     var body: some View {
         NavigationView {
             #if os(macOS)
             CollectionListView()
                 .toolbar {
                     Button(
                         action: {
                             NSApp.keyWindow?.contentViewController?.tryToPerform(
                                 #selector(NSSplitViewController.toggleSidebar(_:)), with: nil
                             )
                         },
                         label: { Image(systemName: "sidebar.left") }
                     )
                     .help("Toggle the sidebar's visibility.")
                     Spacer()
                     Button(action: {
                         withAnimation {
                             // Un-set the currently selected post
                             self.model.selectedPost = nil
                         }
                         // Create the new-post managed object
                         let managedPost = model.editor.generateNewLocalPost(withFont: model.preferences.font)
                         withAnimation {
                             DispatchQueue.main.asyncAfter(deadline: .now()) {
                                 // Load the new post in the editor
                                 self.model.selectedPost = managedPost
                             }
                         }
                     }, label: { Image(systemName: "square.and.pencil") })
                     .help("Create a new local draft.")
                 }
             #else
             CollectionListView(selectedCollection: model.selectedCollection)
             #endif
 
             #if os(macOS)
             ZStack {
                 PostListView()
                 if model.isProcessingRequest {
                     ZStack {
                         Color(NSColor.controlBackgroundColor).opacity(0.75)
                         ProgressView()
                     }
                 }
             }
             #else
-            PostListView(selectedCollection: nil, showAllPosts: false)
+            PostListView(selectedCollection: model.selectedCollection, showAllPosts: model.showAllPosts)
             #endif
 
             Text("Select a post, or create a new local draft.")
                 .foregroundColor(.secondary)
         }
         .environmentObject(model)
     }
 }
 
 struct ContentView_Previews: PreviewProvider {
     static var previews: some View {
         let context = LocalStorageManager.persistentContainer.viewContext
         let model = WriteFreelyModel()
 
         return ContentView()
             .environment(\.managedObjectContext, context)
             .environmentObject(model)
     }
 }
diff --git a/Shared/PostList/PostListView.swift b/Shared/PostList/PostListView.swift
index 1220014..a7ee1a1 100644
--- a/Shared/PostList/PostListView.swift
+++ b/Shared/PostList/PostListView.swift
@@ -1,171 +1,175 @@
 import SwiftUI
 import Combine
 
 struct PostListView: View {
     @EnvironmentObject var model: WriteFreelyModel
     @Environment(\.managedObjectContext) var managedObjectContext
 
     @State private var postCount: Int = 0
 
     var selectedCollection: WFACollection?
     var showAllPosts: Bool
 
     #if os(iOS)
     private var frameHeight: CGFloat {
         var height: CGFloat = 50
         let bottom = UIApplication.shared.windows.first?.safeAreaInsets.bottom ?? 0
         height += bottom
         return height
     }
     #endif
 
     var body: some View {
         #if os(iOS)
         ZStack(alignment: .bottom) {
             PostListFilteredView(
                 collection: selectedCollection,
                 showAllPosts: showAllPosts,
                 postCount: $postCount
             )
                 .navigationTitle(
                     showAllPosts ? "All Posts" : selectedCollection?.title ?? (
                         model.account.server == "https://write.as" ? "Anonymous" : "Drafts"
                     )
                 )
                 .toolbar {
                     ToolbarItem(placement: .primaryAction) {
                         // We have to add a Spacer as a sibling view to the Button in some kind of Stack, so that any
                         // a11y modifiers are applied as expected: bug report filed as FB8956392.
                         ZStack {
                             Spacer()
                             Button(action: {
                                 let managedPost = model.editor.generateNewLocalPost(withFont: model.preferences.font)
                                 withAnimation {
                                     self.model.showAllPosts = false
                                     self.model.selectedPost = managedPost
                                 }
                             }, label: {
                                 ZStack {
                                     Image("does.not.exist")
                                         .accessibilityHidden(true)
                                     Image(systemName: "square.and.pencil")
                                         .accessibilityHidden(true)
                                         .imageScale(.large)         // These modifiers compensate for the resizing
                                         .padding(.vertical, 12)     // done to the Image (and the button tap target)
                                         .padding(.leading, 12)      // by the SwiftUI layout system from adding a
                                         .padding(.trailing, 8)      // Spacer in this ZStack (FB8956392).
                                 }
                                 .frame(maxWidth: .infinity, maxHeight: .infinity)
                             })
                             .accessibilityLabel(Text("Compose"))
                             .accessibilityHint(Text("Compose a new local draft"))
                         }
                     }
                 }
             VStack {
                 HStack(spacing: 0) {
                     Button(action: {
                         model.isPresentingSettingsView = true
                     }, label: {
                         Image(systemName: "gear")
                             .padding(.vertical, 4)
                             .padding(.horizontal, 8)
                     })
                     .accessibilityLabel(Text("Settings"))
                     .accessibilityHint(Text("Open the Settings sheet"))
                     .sheet(
                         isPresented: $model.isPresentingSettingsView,
                         onDismiss: { model.isPresentingSettingsView = false },
                         content: {
                             SettingsView()
                                 .environmentObject(model)
                         }
                     )
                     Spacer()
                     Text(postCount == 1 ? "\(postCount) post" : "\(postCount) posts")
                         .foregroundColor(.secondary)
                         .alert(isPresented: $model.isPresentingNetworkErrorAlert, content: {
                             Alert(
                                 title: Text("Connection Error"),
                                 message: Text("""
                                 There is no internet connection at the moment. Please reconnect or try again later.
                                 """),
                                 dismissButton: .default(Text("OK"), action: {
                                     model.isPresentingNetworkErrorAlert = false
                                 })
                             )
                         })
                     Spacer()
                     if model.isProcessingRequest {
                         ProgressView()
                             .padding(.vertical, 4)
                             .padding(.horizontal, 8)
                     } else {
                         Button(action: {
                             DispatchQueue.main.async {
                                 model.fetchUserCollections()
                                 model.fetchUserPosts()
                             }
                         }, label: {
                             Image(systemName: "arrow.clockwise")
                                 .padding(.vertical, 4)
                                 .padding(.horizontal, 8)
                         })
                         .accessibilityLabel(Text("Refresh Posts"))
                         .accessibilityHint(Text("Fetch changes from the server"))
                         .disabled(!model.account.isLoggedIn)
                     }
                 }
                 .padding(.top, 8)
                 .padding(.horizontal, 8)
                 Spacer()
             }
             .frame(height: frameHeight)
             .background(Color(UIColor.systemGray5))
             .overlay(Divider(), alignment: .top)
         }
         .ignoresSafeArea()
+        .onAppear {
+            model.selectedCollection = selectedCollection
+            model.showAllPosts = showAllPosts
+        }
         #else
         PostListFilteredView(
             collection: selectedCollection,
             showAllPosts: showAllPosts,
             postCount: $postCount
         )
         .toolbar {
             ToolbarItemGroup(placement: .primaryAction) {
                 if model.selectedPost != nil {
                     ActivePostToolbarView(activePost: model.selectedPost!)
                         .alert(isPresented: $model.isPresentingNetworkErrorAlert, content: {
                             Alert(
                                 title: Text("Connection Error"),
                                 message: Text("""
                                     There is no internet connection at the moment. \
                                     Please reconnect or try again later.
                                     """),
                                 dismissButton: .default(Text("OK"), action: {
                                     model.isPresentingNetworkErrorAlert = false
                                 })
                             )
                         })
                 }
             }
         }
         .navigationTitle(
             showAllPosts ? "All Posts" : selectedCollection?.title ?? (
                 model.account.server == "https://write.as" ? "Anonymous" : "Drafts"
             )
         )
         #endif
     }
 }
 
 struct PostListView_Previews: PreviewProvider {
     static var previews: some View {
         let context = LocalStorageManager.persistentContainer.viewContext
         let model = WriteFreelyModel()
 
         return PostListView(showAllPosts: true)
             .environment(\.managedObjectContext, context)
             .environmentObject(model)
     }
 }
diff --git a/Shared/WriteFreely_MultiPlatformApp.swift b/Shared/WriteFreely_MultiPlatformApp.swift
index 79f7320..53bd758 100644
--- a/Shared/WriteFreely_MultiPlatformApp.swift
+++ b/Shared/WriteFreely_MultiPlatformApp.swift
@@ -1,145 +1,155 @@
 import SwiftUI
 
 #if os(macOS)
 import Sparkle
 #endif
 
 @main
 struct CheckForDebugModifier {
     static func main() {
         #if os(macOS)
             if NSEvent.modifierFlags.contains(.shift) {
                 // Clear the launch-to-last-draft values to load a new draft.
                 UserDefaults.standard.setValue(false, forKey: "showAllPostsFlag")
                 UserDefaults.standard.setValue(nil, forKey: "selectedCollectionURL")
                 UserDefaults.standard.setValue(nil, forKey: "lastDraftURL")
             } else {
                 // No-op
             }
         #endif
         WriteFreely_MultiPlatformApp.main()
     }
 }
 
 struct WriteFreely_MultiPlatformApp: App {
     @StateObject private var model = WriteFreelyModel.shared
 
     #if os(macOS)
     // swiftlint:disable:next weak_delegate
     @NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
     @State private var selectedTab = 0
     #endif
 
     var body: some Scene {
         WindowGroup {
             ContentView()
                 .onAppear(perform: {
-//                    if model.editor.showAllPostsFlag {
-//                        DispatchQueue.main.async {
-//                            self.model.selectedCollection = nil
-//                            self.model.showAllPosts = true
-//                        }
-//                    } else {
-//                        DispatchQueue.main.async {
-//                            self.model.selectedCollection = model.editor.fetchSelectedCollectionFromAppStorage()
-//                            self.model.showAllPosts = false
-//                        }
-//                    }
+                    if model.editor.showAllPostsFlag {
+                        DispatchQueue.main.async {
+                            self.model.selectedCollection = nil
+                            self.model.showAllPosts = true
+                            showLastDraftOrCreateNewLocalPost()
+                        }
+                    } else {
+                        DispatchQueue.main.async {
+                            self.model.selectedCollection = model.editor.fetchSelectedCollectionFromAppStorage()
+                            self.model.showAllPosts = false
+                            showLastDraftOrCreateNewLocalPost()
+                        }
+                    }
 //                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
 //                        if model.editor.lastDraftURL != nil {
 //                            self.model.selectedPost = model.editor.fetchLastDraftFromAppStorage()
 //                        } else {
 //                            createNewLocalPost()
 //                        }
 //                    }
                 })
                 .environmentObject(model)
                 .environment(\.managedObjectContext, LocalStorageManager.persistentContainer.viewContext)
 //                .preferredColorScheme(preferences.selectedColorScheme)    // See PreferencesModel for info.
         }
         .commands {
             #if os(macOS)
             CommandGroup(after: .appInfo, addition: {
                 Button("Check For Updates") {
                     SUUpdater.shared()?.checkForUpdates(self)
                 }
             })
             #endif
             CommandGroup(replacing: .newItem, addition: {
                 Button("New Post") {
                     createNewLocalPost()
                 }
                 .keyboardShortcut("n", modifiers: [.command])
             })
             CommandGroup(after: .newItem) {
                 Button("Refresh Posts") {
                     DispatchQueue.main.async {
                         model.fetchUserCollections()
                         model.fetchUserPosts()
                     }
                 }
                 .disabled(!model.account.isLoggedIn)
                 .keyboardShortcut("r", modifiers: [.command])
             }
             SidebarCommands()
             #if os(macOS)
             PostCommands(model: model)
             #endif
             CommandGroup(after: .help) {
                 Button("Visit Support Forum") {
                     #if os(macOS)
                     NSWorkspace().open(model.helpURL)
                     #else
                     UIApplication.shared.open(model.helpURL)
                     #endif
                 }
             }
             ToolbarCommands()
             TextEditingCommands()
         }
 
         #if os(macOS)
         Settings {
             TabView(selection: $selectedTab) {
                 MacAccountView()
                     .environmentObject(model)
                     .tabItem {
                         Image(systemName: "person.crop.circle")
                         Text("Account")
                     }
                     .tag(0)
                 MacPreferencesView(preferences: model.preferences)
                     .tabItem {
                         Image(systemName: "gear")
                         Text("Preferences")
                     }
                     .tag(1)
                 MacUpdatesView()
                     .tabItem {
                         Image(systemName: "arrow.down.circle")
                         Text("Updates")
                     }
                     .tag(2)
             }
             .frame(minWidth: 500, maxWidth: 500, minHeight: 200)
             .padding()
 //            .preferredColorScheme(preferences.selectedColorScheme)    // See PreferencesModel for info.
         }
         #endif
     }
 
+    private func showLastDraftOrCreateNewLocalPost() {
+        if model.editor.lastDraftURL != nil {
+            self.model.selectedPost = model.editor.fetchLastDraftFromAppStorage()
+        } else {
+            createNewLocalPost()
+        }
+    }
+
     private func createNewLocalPost() {
         withAnimation {
             // Un-set the currently selected post
             self.model.selectedPost = nil
         }
         // Create the new-post managed object
         let managedPost = model.editor.generateNewLocalPost(withFont: model.preferences.font)
         withAnimation {
             // Set it as the selectedPost
             DispatchQueue.main.asyncAfter(deadline: .now()) {
                 self.model.selectedPost = managedPost
             }
         }
     }
 }