diff --git a/Mixin/UserInterface/Controllers/Common/AnnouncementViewController.swift b/Mixin/UserInterface/Controllers/Common/AnnouncementViewController.swift
index 20fe664ba7..48d40b2622 100644
--- a/Mixin/UserInterface/Controllers/Common/AnnouncementViewController.swift
+++ b/Mixin/UserInterface/Controllers/Common/AnnouncementViewController.swift
@@ -24,7 +24,6 @@ class AnnouncementViewController: KeyboardBasedLayoutViewController {
         textView.layer.cornerRadius = 8
         textView.layer.masksToBounds = true
         textView.textContainerInset = UIEdgeInsets(top: 12, left: 12, bottom: 12, right: 12)
-        textView.becomeFirstResponder()
         textView.delegate = self
         textView.text = announcement
     }
@@ -41,6 +40,11 @@ class AnnouncementViewController: KeyboardBasedLayoutViewController {
         }
     }
     
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        textView.becomeFirstResponder()
+    }
+    
     override func layout(for keyboardFrame: CGRect) {
         keyboardPlaceholderHeightConstraint.constant = view.frame.height - keyboardFrame.origin.y
         view.layoutIfNeeded()
diff --git a/Mixin/UserInterface/Controllers/Wallet/TransferOutViewController.swift b/Mixin/UserInterface/Controllers/Wallet/TransferOutViewController.swift
index 0a7a4c3090..de21a98b53 100644
--- a/Mixin/UserInterface/Controllers/Wallet/TransferOutViewController.swift
+++ b/Mixin/UserInterface/Controllers/Wallet/TransferOutViewController.swift
@@ -81,7 +81,6 @@ class TransferOutViewController: KeyboardBasedLayoutViewController {
         }
         
         amountTextField.adjustsFontForContentSizeCategory = true
-        amountTextField.becomeFirstResponder()
         amountTextField.delegate = self
         memoTextField.delegate = self
         
@@ -92,7 +91,12 @@ class TransferOutViewController: KeyboardBasedLayoutViewController {
             self.amountTextField.becomeFirstResponder()
         }
     }
-
+    
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        amountTextField.becomeFirstResponder()
+    }
+    
     deinit {
         NotificationCenter.default.removeObserver(self)
     }