 			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) {
-		if detailViewController != nil {
-			currentArticleIndexPath = indexPath
-		} else {
+		selectArticle(nil)
+	}
+	
+	func selectArticle(_ indexPath: IndexPath?) {
+		currentArticleIndexPath = indexPath
+
+		if indexPath == nil {
+			if !rootSplitViewController.isCollapsed {
+				let systemMessageViewController = UIStoryboard.main.instantiateController(ofType: SystemMessageViewController.self)
+				let showBackButton = rootSplitViewController.displayMode != .allVisible
+				let targetSplit = targetSplitForDetail()
+				let controller = addNavControllerIfNecessary(systemMessageViewController, split: targetSplit, showBackButton: showBackButton)
+				targetSplit.showDetailViewController(controller, sender: self)
+			}
+			return
+		}
+		
+		if detailViewController == nil {
 			let targetSplit = targetSplitForDetail()
 
 			let detailViewController = UIStoryboard.main.instantiateController(ofType: DetailViewController.self)

		rootSplitViewController.delegate = self
		
		masterNavigationController = (rootSplitViewController.viewControllers.first as! UINavigationController)
		masterNavigationController.delegate = self
		masterFeedViewController = UIStoryboard.main.instantiateController(ofType: MasterFeedViewController.self)
		masterFeedViewController.coordinator = self
		masterNavigationController.pushViewController(masterFeedViewController, animated: false)

		
		activityViewController.popoverPresentationController?.barButtonItem = detailViewController.actionBarButtonItem
		detailViewController.present(activityViewController, animated: true)
	}
	
}
