diff --git a/Shared/PostEditor/PostEditorView.swift b/Shared/PostEditor/PostEditorView.swift
index 0f7d025..6182e87 100644
--- a/Shared/PostEditor/PostEditorView.swift
+++ b/Shared/PostEditor/PostEditorView.swift
@@ -1,77 +1,81 @@
 import SwiftUI
 
 struct PostEditorView: View {
     @EnvironmentObject var model: WriteFreelyModel
 
     @ObservedObject var post: WFAPost
 
     var body: some View {
         VStack {
             TextEditor(text: $post.title)
                 .font(.title)
                 .frame(height: 100)
                 .onChange(of: post.title) { _ in
                     if post.status == PostStatus.published.rawValue {
                         post.status = PostStatus.edited.rawValue
                     }
                 }
             TextEditor(text: $post.body)
                 .font(.body)
                 .onChange(of: post.body) { _ in
                     if post.status == PostStatus.published.rawValue {
                         post.status = PostStatus.edited.rawValue
                     }
                 }
         }
         .padding()
         .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)
+                .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
             }
         })
         .onDisappear(perform: {
             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)
         }
     }
 }
 
 struct PostEditorView_Previews: 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()
 
         let model = WriteFreelyModel()
 
         return PostEditorView(post: testPost)
             .environment(\.managedObjectContext, context)
             .environmentObject(model)
     }
 }
diff --git a/Shared/PostList/PostListView.swift b/Shared/PostList/PostListView.swift
index 3b5eaaa..32df675 100644
--- a/Shared/PostList/PostListView.swift
+++ b/Shared/PostList/PostListView.swift
@@ -1,131 +1,131 @@
 import SwiftUI
 
 struct PostListView: View {
     @EnvironmentObject var model: WriteFreelyModel
     @Environment(\.managedObjectContext) var moc
 
     @State var selectedCollection: WFACollection?
     @State var showAllPosts: Bool = false
 
     var body: some View {
         #if os(iOS)
         GeometryReader { geometry in
             PostListFilteredView(filter: selectedCollection?.alias, showAllPosts: showAllPosts)
             .navigationTitle(
                 showAllPosts ? "All Posts" : selectedCollection?.title ?? (
                     model.account.server == "https://write.as" ? "Anonymous" : "Drafts"
                 )
             )
             .toolbar {
                 ToolbarItem(placement: .primaryAction) {
                     Button(action: {
                         createNewLocalDraft()
                     }, label: {
                         Image(systemName: "square.and.pencil")
                     })
                 }
                 ToolbarItem(placement: .bottomBar) {
                     HStack {
                         Button(action: {
                             model.isPresentingSettingsView = true
                         }, label: {
                             Image(systemName: "gear")
                         })
                         .padding(.leading)
                         Spacer()
                         Text(pluralizedPostCount(for: showPosts(for: selectedCollection)))
                             .foregroundColor(.secondary)
                         Spacer()
                         Button(action: {
                             reloadFromServer()
                         }, label: {
                             Image(systemName: "arrow.clockwise")
                         })
-                        .disabled(!model.account.isLoggedIn)
+                        .disabled(!model.account.isLoggedIn || !model.hasNetworkConnection)
                     }
                     .padding()
                     .frame(width: geometry.size.width)
                 }
             }
         }
         #else //if os(macOS)
         PostListFilteredView(filter: selectedCollection?.alias, showAllPosts: showAllPosts)
         .navigationTitle(
             showAllPosts ? "All Posts" : selectedCollection?.title ?? (
                 model.account.server == "https://write.as" ? "Anonymous" : "Drafts"
             )
         )
         .navigationSubtitle(pluralizedPostCount(for: showPosts(for: selectedCollection)))
         .toolbar {
             Button(action: {
                 createNewLocalDraft()
             }, label: {
                 Image(systemName: "square.and.pencil")
             })
             Button(action: {
                 reloadFromServer()
             }, label: {
                 Image(systemName: "arrow.clockwise")
             })
-            .disabled(!model.account.isLoggedIn)
+            .disabled(!model.account.isLoggedIn || !model.hasNetworkConnection)
         }
         #endif
     }
 
     private func pluralizedPostCount(for posts: [WFAPost]) -> String {
         if posts.count == 1 {
             return "1 post"
         } else {
             return "\(posts.count) posts"
         }
     }
 
     private func showPosts(for collection: WFACollection?) -> [WFAPost] {
         if showAllPosts {
             return model.posts.userPosts
         } else {
             if let selectedCollection = collection {
                 return model.posts.userPosts.filter { $0.collectionAlias == selectedCollection.alias }
             } else {
                 return model.posts.userPosts.filter { $0.collectionAlias == nil }
             }
         }
     }
 
     private func reloadFromServer() {
         DispatchQueue.main.async {
             model.fetchUserCollections()
             model.fetchUserPosts()
         }
     }
 
     private func createNewLocalDraft() {
         let managedPost = WFAPost(context: LocalStorageManager.persistentContainer.viewContext)
         managedPost.createdDate = Date()
         managedPost.title = ""
         managedPost.body = ""
         managedPost.status = PostStatus.local.rawValue
         if let languageCode = Locale.current.languageCode {
             managedPost.language = languageCode
             managedPost.rtl = Locale.characterDirection(forLanguage: languageCode) == .rightToLeft
         }
         if let selectedCollectionAlias = selectedCollection?.alias {
             managedPost.collectionAlias = selectedCollectionAlias
         }
         DispatchQueue.main.async {
             LocalStorageManager().saveContext()
         }
         model.selectedPost = managedPost
     }
 }
 
 struct PostListView_Previews: PreviewProvider {
     static var previews: some View {
         let context = LocalStorageManager.persistentContainer.viewContext
         let model = WriteFreelyModel()
 
         return PostListView()
             .environment(\.managedObjectContext, context)
             .environmentObject(model)
     }
 }