diff --git a/iOS/AppCoordinator.swift b/iOS/AppCoordinator.swift
index 45ebe877a..fa31901a2 100644
--- a/iOS/AppCoordinator.swift
+++ b/iOS/AppCoordinator.swift
@@ -452,6 +452,13 @@ class AppCoordinator: NSObject, UndoableCommandRunner {
 			currentMasterIndexPath = indexPath
 			navControllerForTimeline().pushViewController(masterTimelineViewController!, animated: true)
 		}
+		
+		if isThreePanelMode {
+			let systemMessageViewController = UIStoryboard.main.instantiateController(ofType: SystemMessageViewController.self)
+			let targetSplitController = targetSplitForDetail()
+			let controller = addNavControllerIfNecessary(systemMessageViewController, split: targetSplitController, showBackButton: false)
+			targetSplitController.showDetailViewController(controller, sender: self)
+		}
 	}
 	
 	func selectArticle(_ indexPath: IndexPath) {
diff --git a/iOS/MasterTimeline/MasterTimelineViewController.swift b/iOS/MasterTimeline/MasterTimelineViewController.swift
index 2965d4e02..ae4a07df5 100644
--- a/iOS/MasterTimeline/MasterTimelineViewController.swift
+++ b/iOS/MasterTimeline/MasterTimelineViewController.swift
@@ -352,6 +352,7 @@ private extension MasterTimelineViewController {
 		title = coordinator.timelineName
 		navigationController?.title = coordinator.timelineName
 		
+		tableView.selectRow(at: nil, animated: false, scrollPosition: .top)
 		if coordinator.articles.count > 0 {
 			tableView.scrollToRow(at: IndexPath(row: 0, section: 0), at: .top, animated: false)
 		}