diff --git a/Shared/Account/AccountLoginView.swift b/Shared/Account/AccountLoginView.swift
index 02c32f9..de7bb97 100644
--- a/Shared/Account/AccountLoginView.swift
+++ b/Shared/Account/AccountLoginView.swift
@@ -1,87 +1,89 @@
 import SwiftUI
 
 struct AccountLoginView: View {
     @EnvironmentObject var model: WriteFreelyModel
 
     @State private var alertMessage: String = ""
     @State private var username: String = ""
     @State private var password: String = ""
     @State private var server: String = ""
     var body: some View {
         VStack {
             Text("Log in to publish and share your posts.")
                 .font(.caption)
                 .foregroundColor(.secondary)
             HStack {
                 Image(systemName: "person.circle")
                     .foregroundColor(.gray)
                 #if os(iOS)
                 TextField("Username", text: $username)
                     .autocapitalization(.none)
                     .disableAutocorrection(true)
                     .textFieldStyle(RoundedBorderTextFieldStyle())
                 #else
                 TextField("Username", text: $username)
                 #endif
             }
             HStack {
                 Image(systemName: "lock.circle")
                     .foregroundColor(.gray)
                 #if os(iOS)
                 SecureField("Password", text: $password)
                     .autocapitalization(.none)
                     .disableAutocorrection(true)
                     .textFieldStyle(RoundedBorderTextFieldStyle())
                 #else
                 SecureField("Password", text: $password)
                 #endif
             }
             HStack {
                 Image(systemName: "link.circle")
                     .foregroundColor(.gray)
                 #if os(iOS)
                 TextField("Server URL", text: $server)
                     .keyboardType(.URL)
                     .autocapitalization(.none)
                     .disableAutocorrection(true)
                     .textFieldStyle(RoundedBorderTextFieldStyle())
                 #else
                 TextField("Server URL", text: $server)
                 #endif
             }
             Spacer()
             if model.isLoggingIn {
                 ProgressView("Logging in...")
                     .padding()
             } else {
                 Button(action: {
+                    #if os(iOS)
                     hideKeyboard()
+                    #endif
                     model.login(
                         to: URL(string: server)!,
                         as: username, password: password
                     )
                 }, label: {
                     Text("Log In")
                 })
                 .disabled(
                     model.account.isLoggedIn || (username.isEmpty || password.isEmpty || server.isEmpty)
                 )
                 .padding()
             }
         }
         .alert(isPresented: $model.isPresentingLoginErrorAlert) {
             Alert(
                 title: Text("Error Logging In"),
                 message: Text(model.loginErrorMessage ?? "An unknown error occurred while trying to login."),
                 dismissButton: .default(Text("OK"))
             )
         }
     }
 }
 
 struct AccountLoginView_Previews: PreviewProvider {
     static var previews: some View {
         AccountLoginView()
             .environmentObject(WriteFreelyModel())
     }
 }
diff --git a/Shared/Account/AccountLogoutView.swift b/Shared/Account/AccountLogoutView.swift
index 0e2f0cf..9f69a50 100644
--- a/Shared/Account/AccountLogoutView.swift
+++ b/Shared/Account/AccountLogoutView.swift
@@ -1,58 +1,89 @@
 import SwiftUI
 
 struct AccountLogoutView: View {
     @EnvironmentObject var model: WriteFreelyModel
 
     @State private var isPresentingLogoutConfirmation: Bool = false
     @State private var editedPostsWarningString: String = ""
 
     var body: some View {
+        #if os(iOS)
         VStack {
             Spacer()
             VStack {
                 Text("Logged in as \(model.account.username)")
                 Text("on \(model.account.server)")
             }
             Spacer()
             Button(action: logoutHandler, label: {
                 Text("Log Out")
             })
         }
         .actionSheet(isPresented: $isPresentingLogoutConfirmation, content: {
             ActionSheet(
                 title: Text("Log Out?"),
                 message: Text("\(editedPostsWarningString)You won't lose any local posts. Are you sure?"),
                 buttons: [
                     .destructive(Text("Log Out"), action: {
                         model.logout()
                     }),
                     .cancel()
                 ]
             )
         })
+        #else
+        VStack {
+            Spacer()
+            VStack {
+                Text("Logged in as \(model.account.username)")
+                Text("on \(model.account.server)")
+            }
+            Spacer()
+            Button(action: logoutHandler, label: {
+                Text("Log Out")
+            })
+        }
+        .sheet(isPresented: $isPresentingLogoutConfirmation) {
+            VStack {
+                Text("Log Out?")
+                    .font(.title)
+                Text("\(editedPostsWarningString)You won't lose any local posts. Are you sure?")
+                HStack {
+                    Button(action: model.logout, label: {
+                        Text("Log Out")
+                    })
+                    Button(action: {
+                        self.isPresentingLogoutConfirmation = false
+                    }, label: {
+                        Text("Cancel")
+                    }).keyboardShortcut(.cancelAction)
+                }
+            }
+        }
+        #endif
     }
 
     func logoutHandler() {
         let request = WFAPost.createFetchRequest()
         request.predicate = NSPredicate(format: "status == %i", 1)
         do {
             let editedPosts = try LocalStorageManager.persistentContainer.viewContext.fetch(request)
             if editedPosts.count == 1 {
                 editedPostsWarningString = "You'll lose unpublished changes to \(editedPosts.count) edited post. "
             }
             if editedPosts.count > 1 {
                 editedPostsWarningString = "You'll lose unpublished changes to \(editedPosts.count) edited posts. "
             }
         } catch {
             print("Error: failed to fetch cached posts")
         }
         self.isPresentingLogoutConfirmation = true
     }
 }
 
 struct AccountLogoutView_Previews: PreviewProvider {
     static var previews: some View {
         AccountLogoutView()
             .environmentObject(WriteFreelyModel())
     }
 }