diff --git a/Mac/MainWindow/MainWindowController.swift b/Mac/MainWindow/MainWindowController.swift
index dca7e45cf..de1899f43 100644
--- a/Mac/MainWindow/MainWindowController.swift
+++ b/Mac/MainWindow/MainWindowController.swift
@@ -427,12 +427,14 @@ extension MainWindowController: NSWindowDelegate {
 	
 	func window(_ window: NSWindow, willEncodeRestorableState coder: NSCoder) {
 		saveSplitViewState(to: coder)
-		sidebarViewController?.encodeState(with: coder)
+		sidebarViewController?.saveState(to: coder)
+		timelineContainerViewController?.saveState(to: coder)
 	}
 
 	func window(_ window: NSWindow, didDecodeRestorableState coder: NSCoder) {
 		restoreSplitViewState(from: coder)
-		sidebarViewController?.decodeState(with: coder)
+		sidebarViewController?.restoreState(from: coder)
+		timelineContainerViewController?.restoreState(from: coder)
 	}
 
 	func windowWillClose(_ notification: Notification) {
diff --git a/Mac/MainWindow/Sidebar/SidebarViewController.swift b/Mac/MainWindow/Sidebar/SidebarViewController.swift
index 397f12889..20c017ffc 100644
--- a/Mac/MainWindow/Sidebar/SidebarViewController.swift
+++ b/Mac/MainWindow/Sidebar/SidebarViewController.swift
@@ -93,11 +93,11 @@ protocol SidebarDelegate: class {
 
 	// MARK: State Restoration
 	
-	func encodeState(with coder: NSCoder) {
+	func saveState(to coder: NSCoder) {
 		coder.encode(isReadFiltered, forKey: UserInfoKey.readFeedsFilterState)
 	}
 	
-	func decodeState(with coder: NSCoder) {
+	func restoreState(from coder: NSCoder) {
 		isReadFiltered = coder.decodeBool(forKey: UserInfoKey.readFeedsFilterState)
 		rebuildTreeAndRestoreSelection()
 	}
diff --git a/Mac/MainWindow/Timeline/TimelineContainerViewController.swift b/Mac/MainWindow/Timeline/TimelineContainerViewController.swift
index ac77dda57..9dcefff47 100644
--- a/Mac/MainWindow/Timeline/TimelineContainerViewController.swift
+++ b/Mac/MainWindow/Timeline/TimelineContainerViewController.swift
@@ -95,12 +95,12 @@ final class TimelineContainerViewController: NSViewController {
 	
 	// MARK: State Restoration
 	
-	func encodeState(with coder: NSCoder) {
-		regularTimelineViewController.encodeState(with: coder)
+	func saveState(to coder: NSCoder) {
+		regularTimelineViewController.saveState(to: coder)
 	}
 	
-	func decodeState(with coder: NSCoder) {
-		regularTimelineViewController.decodeState(with: coder)
+	func restoreState(from coder: NSCoder) {
+		regularTimelineViewController.restoreState(from: coder)
 	}
 }
 
diff --git a/Mac/MainWindow/Timeline/TimelineViewController.swift b/Mac/MainWindow/Timeline/TimelineViewController.swift
index 6a977a919..35b2a6076 100644
--- a/Mac/MainWindow/Timeline/TimelineViewController.swift
+++ b/Mac/MainWindow/Timeline/TimelineViewController.swift
@@ -246,11 +246,11 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner, Unr
 	
 	// MARK: State Restoration
 	
-	func encodeState(with coder: NSCoder) {
+	func saveState(to coder: NSCoder) {
 
 	}
 	
-	func decodeState(with coder: NSCoder) {
+	func restoreState(from coder: NSCoder) {
 
 	}