diff --git a/Mac/Base.lproj/Main.storyboard b/Mac/Base.lproj/Main.storyboard
index 6ec974d60..907673434 100644
--- a/Mac/Base.lproj/Main.storyboard
+++ b/Mac/Base.lproj/Main.storyboard
@@ -401,7 +401,7 @@
                                         <menuItem title="Show Sidebar" keyEquivalent="s" id="kIP-vf-haE">
                                             <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
                                             <connections>
-                                                <action selector="toggleTheSidebar:" target="Ady-hI-5gd" id="1hl-EZ-ao4"/>
+                                                <action selector="toggleSidebar:" target="Ady-hI-5gd" id="2jN-YZ-Uaa"/>
                                             </connections>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="jKG-b2-ZWf"/>
diff --git a/Mac/MainWindow/MainWindowController.swift b/Mac/MainWindow/MainWindowController.swift
index b5a966381..d50373019 100644
--- a/Mac/MainWindow/MainWindowController.swift
+++ b/Mac/MainWindow/MainWindowController.swift
@@ -263,20 +263,6 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
 			return validateToggleReadArticles(item)
 		}
 
-		if item.action == #selector(toggleTheSidebar(_:)) {
-			guard let splitViewItem = sidebarSplitViewItem else {
-				return false
-			}
-
-			let sidebarIsShowing = !splitViewItem.isCollapsed
-			if let menuItem = item as? NSMenuItem {
-				let title = sidebarIsShowing ? NSLocalizedString("Hide Sidebar", comment: "Menu item") : NSLocalizedString("Show Sidebar", comment: "Menu item")
-				menuItem.title = title
-			}
-
-			return true
-		}
-		
 		return true
 	}
 
@@ -443,16 +429,6 @@ class MainWindowController : NSWindowController, NSUserInterfaceValidations {
 		nextUnread(sender)
 	}
 
-	@IBAction func toggleTheSidebar(_ sender: Any?) {
-		splitViewController!.toggleSidebar(sender)
-		guard let splitViewItem = sidebarSplitViewItem else { return }
-		if splitViewItem.isCollapsed {
-			currentTimelineViewController?.focus()
-		} else {
-			sidebarViewController?.focus()
-		}
-	}
-	
 	@IBAction func markOlderArticlesAsRead(_ sender: Any?) {
 		currentTimelineViewController?.markOlderArticlesRead()
 	}
@@ -748,7 +724,6 @@ extension MainWindowController : ScriptingMainWindowController {
 // MARK: - NSToolbarDelegate
 
 extension NSToolbarItem.Identifier {
-	static let sidebarToggle = NSToolbarItem.Identifier("sidebarToggle")
 	static let newFeed = NSToolbarItem.Identifier("newFeed")
 	static let newFolder = NSToolbarItem.Identifier("newFolder")
 	static let refresh = NSToolbarItem.Identifier("refresh")
@@ -773,10 +748,6 @@ extension MainWindowController: NSToolbarDelegate {
 
 		switch itemIdentifier {
 
-		case .sidebarToggle:
-			let title = NSLocalizedString("Toggle Sidebar", comment: "Toggle Sidebar")
-			return buildToolbarButton(.toggleSidebar, title, AppAssets.sidebarToggleImage, "toggleTheSidebar:")
-
 		case .refresh:
 			let title = NSLocalizedString("Refresh", comment: "Refresh")
 			return buildToolbarButton(.refresh, title, AppAssets.refreshImage, "refreshAll:")
@@ -859,7 +830,7 @@ extension MainWindowController: NSToolbarDelegate {
 	
 	func toolbarAllowedItemIdentifiers(_ toolbar: NSToolbar) -> [NSToolbarItem.Identifier] {
 		[
-			.sidebarToggle,
+			NSToolbarItem.Identifier.toggleSidebar,
 			.refresh,
 			.newSidebarItemMenu,
 			.sidebarTrackingSeparator,
@@ -885,6 +856,7 @@ extension MainWindowController: NSToolbarDelegate {
 			.refresh,
 			.newSidebarItemMenu,
 			.sidebarTrackingSeparator,
+			NSToolbarItem.Identifier.toggleSidebar,
 			.markAllAsRead,
 			.toggleReadArticlesFilter,
 			.timelineTrackingSeparator,