From ac03992430332c549f36727f11b89b62383c754b Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Thu, 5 Sep 2019 10:46:24 -0500
Subject: [PATCH] Fix bug in arrow key navigation where focus could get stolen
 from the timeline

---
 iOS/Detail/DetailViewController.swift | 4 ----
 iOS/SceneCoordinator.swift            | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/iOS/Detail/DetailViewController.swift b/iOS/Detail/DetailViewController.swift
index 83ee0762c..1cd79b0fd 100644
--- a/iOS/Detail/DetailViewController.swift
+++ b/iOS/Detail/DetailViewController.swift
@@ -31,10 +31,6 @@ class DetailViewController: UIViewController {
 		return keyboardManager.keyCommands
 	}
 	
-	override var canBecomeFirstResponder: Bool {
-		return true
-	}
-
 	deinit {
 		webView.removeFromSuperview()
 		DetailViewControllerWebViewProvider.shared.enqueueWebView(webView)
diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift
index c9a458735..ac7133745 100644
--- a/iOS/SceneCoordinator.swift
+++ b/iOS/SceneCoordinator.swift
@@ -819,10 +819,10 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
 	}
 	
 	func navigateToTimeline() {
-		masterTimelineViewController?.focus()
 		if currentArticleIndexPath == nil {
 			selectArticle(IndexPath(row: 0, section: 0))
 		}
+		masterTimelineViewController?.focus()
 	}
 	
 	func navigateToDetail() {