diff --git a/Shared/PostList/PostListFilteredView.swift b/Shared/PostList/PostListFilteredView.swift
index d528176..3460033 100644
--- a/Shared/PostList/PostListFilteredView.swift
+++ b/Shared/PostList/PostListFilteredView.swift
@@ -1,145 +1,154 @@
 import SwiftUI
 
 struct PostListFilteredView: View {
     @EnvironmentObject var model: WriteFreelyModel
     @Binding var postCount: Int
     @FetchRequest(entity: WFACollection.entity(), sortDescriptors: []) var collections: FetchedResults<WFACollection>
     var fetchRequest: FetchRequest<WFAPost>
 
     var showAllPosts: Bool {
         didSet {
             model.showAllPosts = showAllPosts
         }
     }
 
     var selectedCollection: WFACollection? {
         didSet {
             model.selectedCollection = selectedCollection
         }
     }
 
     init(collection: WFACollection?, showAllPosts: Bool, postCount: Binding<Int>) {
         self.showAllPosts = showAllPosts
         self.selectedCollection = collection
         if showAllPosts {
             fetchRequest = FetchRequest<WFAPost>(
                 entity: WFAPost.entity(),
                 sortDescriptors: [NSSortDescriptor(key: "createdDate", ascending: false)]
             )
         } else {
             if let collectionAlias = collection?.alias {
                 fetchRequest = FetchRequest<WFAPost>(
                     entity: WFAPost.entity(),
                     sortDescriptors: [NSSortDescriptor(key: "createdDate", ascending: false)],
                     predicate: NSPredicate(format: "collectionAlias == %@", collectionAlias)
                 )
             } else {
                 fetchRequest = FetchRequest<WFAPost>(
                     entity: WFAPost.entity(),
                     sortDescriptors: [NSSortDescriptor(key: "createdDate", ascending: false)],
                     predicate: NSPredicate(format: "collectionAlias == nil")
                 )
             }
         }
         _postCount = postCount
     }
 
     var body: some View {
         #if os(iOS)
         List {
             ForEach(fetchRequest.wrappedValue, id: \.self) { post in
                 NavigationLink(
                     destination: PostEditorView(post: post),
                     tag: post,
                     selection: $model.selectedPost
                 ) {
                     if showAllPosts {
                         if let collection = collections.filter { $0.alias == post.collectionAlias }.first {
                             PostCellView(post: post, collectionName: collection.title)
                         } else {
                             let collectionName = model.account.server == "https://write.as" ? "Anonymous" : "Drafts"
                             PostCellView(post: post, collectionName: collectionName)
                         }
                     } else {
                         PostCellView(post: post)
                     }
                 }
                 .deleteDisabled(post.status != PostStatus.local.rawValue)
             }
             .onDelete(perform: { indexSet in
                 for index in indexSet {
                     let post = fetchRequest.wrappedValue[index]
                     delete(post)
                 }
             })
         }
         .onAppear(perform: {
             self.postCount = fetchRequest.wrappedValue.count
         })
         .onChange(of: fetchRequest.wrappedValue.count, perform: { value in
             self.postCount = value
         })
         #else
         List {
             ForEach(fetchRequest.wrappedValue, id: \.self) { post in
                 NavigationLink(
                     destination: PostEditorView(post: post),
                     tag: post,
                     selection: $model.selectedPost
                 ) {
-                    PostCellView(post: post)
+                    if showAllPosts {
+                        if let collection = collections.filter { $0.alias == post.collectionAlias }.first {
+                            PostCellView(post: post, collectionName: collection.title)
+                        } else {
+                            let collectionName = model.account.server == "https://write.as" ? "Anonymous" : "Drafts"
+                            PostCellView(post: post, collectionName: collectionName)
+                        }
+                    } else {
+                        PostCellView(post: post)
+                    }
                 }
                 .deleteDisabled(post.status != PostStatus.local.rawValue)
             }
             .onDelete(perform: { indexSet in
                 for index in indexSet {
                     let post = fetchRequest.wrappedValue[index]
                     delete(post)
                 }
             })
         }
         .alert(isPresented: $model.isPresentingDeleteAlert) {
             Alert(
                 title: Text("Delete Post?"),
                 message: Text("This action cannot be undone."),
                 primaryButton: .cancel() {
                     model.postToDelete = nil
                 },
                 secondaryButton: .destructive(Text("Delete"), action: {
                     if let postToDelete = model.postToDelete {
                         model.selectedPost = nil
                         DispatchQueue.main.async {
                             model.editor.clearLastDraft()
                             model.posts.remove(postToDelete)
                         }
                         model.postToDelete = nil
                     }
                 })
             )
         }
         .onDeleteCommand(perform: {
             guard let selectedPost = model.selectedPost else { return }
             if selectedPost.status == PostStatus.local.rawValue {
                 model.postToDelete = selectedPost
                 model.isPresentingDeleteAlert = true
             }
         })
         #endif
     }
 
     func delete(_ post: WFAPost) {
         DispatchQueue.main.async {
             if post == model.selectedPost {
                 model.selectedPost = nil
                 model.editor.clearLastDraft()
             }
             model.posts.remove(post)
         }
     }
 }
 
 struct PostListFilteredView_Previews: PreviewProvider {
     static var previews: some View {
         return PostListFilteredView(collection: nil, showAllPosts: false, postCount: .constant(999))
     }
 }
diff --git a/Shared/PostList/PostListView.swift b/Shared/PostList/PostListView.swift
index 5413e88..8199e17 100644
--- a/Shared/PostList/PostListView.swift
+++ b/Shared/PostList/PostListView.swift
@@ -1,130 +1,130 @@
 import SwiftUI
 import Combine
 
 struct PostListView: View {
     @EnvironmentObject var model: WriteFreelyModel
     @Environment(\.managedObjectContext) var managedObjectContext
 
     @State var selectedCollection: WFACollection?
     @State var showAllPosts: Bool = false
     @State private var postCount: Int = 0
 
     var body: some View {
         #if os(iOS)
         GeometryReader { geometry in
             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) {
                     Button(action: {
                         let managedPost = WFAPost(context: self.managedObjectContext)
                         managedPost.createdDate = Date()
                         managedPost.title = ""
                         managedPost.body = ""
                         managedPost.status = PostStatus.local.rawValue
                         managedPost.collectionAlias = nil
                         switch model.preferences.font {
                         case 1:
                             managedPost.appearance = "sans"
                         case 2:
                             managedPost.appearance = "wrap"
                         default:
                             managedPost.appearance = "serif"
                         }
                         if let languageCode = Locale.current.languageCode {
                             managedPost.language = languageCode
                             managedPost.rtl = Locale.characterDirection(forLanguage: languageCode) == .rightToLeft
                         }
                         withAnimation {
                             self.selectedCollection = nil
                             self.showAllPosts = false
                             self.model.selectedPost = managedPost
                         }
                     }, label: {
                         Image(systemName: "square.and.pencil")
                     })
                 }
                 ToolbarItem(placement: .bottomBar) {
                     HStack {
                         Button(action: {
                             model.isPresentingSettingsView = true
                         }, label: {
                             Image(systemName: "gear")
                         })
                         Spacer()
                         Text(postCount == 1 ? "\(postCount) post" : "\(postCount) posts")
                             .foregroundColor(.secondary)
                         Spacer()
                         if model.isProcessingRequest {
                             ProgressView()
                         } else {
                             Button(action: {
                                 DispatchQueue.main.async {
                                     model.fetchUserCollections()
                                     model.fetchUserPosts()
                                 }
                             }, label: {
                                 Image(systemName: "arrow.clockwise")
                             })
                             .disabled(!model.account.isLoggedIn)
                         }
                     }
                     .padding()
                     .frame(width: geometry.size.width)
                 }
             }
         }
         #else //if os(macOS)
         PostListFilteredView(
             collection: selectedCollection,
             showAllPosts: showAllPosts,
             postCount: $postCount
         )
         .toolbar {
             ToolbarItemGroup(placement: .primaryAction) {
                 if let selectedPost = model.selectedPost {
                     ActivePostToolbarView(activePost: 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
                                 })
                             )
                         })
                 }
             }
         }
         .onDisappear {
             DispatchQueue.main.async {
-                model.selectedCollection = nil
-                model.showAllPosts = true
-                model.selectedPost = nil
+                self.model.selectedCollection = nil
+                self.model.showAllPosts = true
+                self.model.selectedPost = nil
             }
         }
         .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()
             .environment(\.managedObjectContext, context)
             .environmentObject(model)
     }
 }