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() {