diff --git a/Shared/Navigation/ContentView.swift b/Shared/Navigation/ContentView.swift
index 6831b7c..69b9daa 100644
--- a/Shared/Navigation/ContentView.swift
+++ b/Shared/Navigation/ContentView.swift
@@ -1,67 +1,79 @@
 import SwiftUI
 
 struct ContentView: View {
     @EnvironmentObject var model: WriteFreelyModel
 
     var body: some View {
         NavigationView {
+            #if os(macOS)
             SidebarView()
+                .toolbar {
+                    Button(action: {
+                        NSApp.keyWindow?.contentViewController?.tryToPerform(
+                            #selector(NSSplitViewController.toggleSidebar(_:)),
+                            with: nil
+                        )
+                    }, label: { Image(systemName: "sidebar.left") })
+                }
+            #else
+            SidebarView()
+            #endif
 
             PostListView(selectedCollection: nil, showAllPosts: model.account.isLoggedIn)
 
             Text("Select a post, or create a new local draft.")
                 .foregroundColor(.secondary)
         }
         .environmentObject(model)
         .alert(isPresented: $model.isPresentingDeleteAlert) {
             Alert(
                 title: Text("Delete Post?"),
                 message: Text("This action cannot be undone."),
                 primaryButton: .destructive(Text("Delete"), action: {
                     if let postToDelete = model.postToDelete {
                         model.selectedPost = nil
                         DispatchQueue.main.async {
                             model.posts.remove(postToDelete)
                         }
                         model.postToDelete = nil
                     }
                 }),
                 secondaryButton: .cancel() {
                     model.postToDelete = nil
                 }
             )
         }
         .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
                 })
             )
         })
 
         #if os(iOS)
         EmptyView()
             .sheet(
                 isPresented: $model.isPresentingSettingsView,
                 onDismiss: { model.isPresentingSettingsView = false },
                 content: {
                     SettingsView()
                         .environmentObject(model)
                 }
             )
         #endif
     }
 }
 
 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/WriteFreely_MultiPlatformApp.swift b/Shared/WriteFreely_MultiPlatformApp.swift
index ef3a31f..787111b 100644
--- a/Shared/WriteFreely_MultiPlatformApp.swift
+++ b/Shared/WriteFreely_MultiPlatformApp.swift
@@ -1,71 +1,74 @@
 import SwiftUI
 
 @main
 struct WriteFreely_MultiPlatformApp: App {
     @StateObject private var model = WriteFreelyModel()
 
     #if os(macOS)
     @State private var selectedTab = 0
     #endif
 
     var body: some Scene {
         WindowGroup {
             ContentView()
                 .onAppear(perform: {
                     if let lastDraft = model.editor.fetchLastDraftFromUserDefaults() {
                         self.model.selectedPost = lastDraft
                     } else {
                         createNewLocalPost()
                     }
                 })
                 .environmentObject(model)
                 .environment(\.managedObjectContext, LocalStorageManager.persistentContainer.viewContext)
 //                .preferredColorScheme(preferences.selectedColorScheme)    // See PreferencesModel for info.
         }
+        .commands {
+            SidebarCommands()
+        }
 
         #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)
             }
             .frame(minWidth: 300, maxWidth: 300, minHeight: 200, maxHeight: 200)
             .padding()
 //            .preferredColorScheme(preferences.selectedColorScheme)    // See PreferencesModel for info.
         }
         #endif
     }
 
     private func createNewLocalPost() {
         let managedPost = WFAPost(context: LocalStorageManager.persistentContainer.viewContext)
         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
         }
         self.model.selectedPost = managedPost
     }
 }