From e63a13eb59bf837fa46e0fa6222e340a1df7f7ed Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Tue, 17 Aug 2021 10:27:13 -0300
Subject: [PATCH] Respond to CR.

---
 .../AppSettings/Profile/UsernameViewController.swift        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Signal/src/ViewControllers/AppSettings/Profile/UsernameViewController.swift b/Signal/src/ViewControllers/AppSettings/Profile/UsernameViewController.swift
index 15b74a05c0..5dd90ecb07 100644
--- a/Signal/src/ViewControllers/AppSettings/Profile/UsernameViewController.swift
+++ b/Signal/src/ViewControllers/AppSettings/Profile/UsernameViewController.swift
@@ -152,9 +152,13 @@ class UsernameViewController: OWSTableViewController2 {
         ))
         contents.addSection(section)
 
+        let wasFirstResponder = usernameTextField.isFirstResponder
+
         self.contents = contents
 
-        usernameTextField.becomeFirstResponder()
+        if wasFirstResponder {
+            usernameTextField.becomeFirstResponder()
+        }
     }
 
     override func themeDidChange() {