diff --git a/Signal/src/Usernames/Selection/UsernameSelectionViewController+UsernameTextField.swift b/Signal/src/Usernames/Selection/UsernameSelectionViewController+UsernameTextField.swift
index ff806902da..05a8d83595 100644
--- a/Signal/src/Usernames/Selection/UsernameSelectionViewController+UsernameTextField.swift
+++ b/Signal/src/Usernames/Selection/UsernameSelectionViewController+UsernameTextField.swift
@@ -189,7 +189,10 @@ extension UsernameSelectionViewController {
 
             @discardableResult
             override func becomeFirstResponder() -> Bool {
-                discriminatorTextField.becomeFirstResponder()
+                guard !discriminatorTextField.isHidden else {
+                    return false
+                }
+                return discriminatorTextField.becomeFirstResponder()
             }
 
             /// Tapping the discriminator when it is not focused should start