diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.kt
index 0fcc8a5278..4ad391ec88 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.kt
@@ -81,7 +81,7 @@ class EditProfileFragment : LoggingFragment() {
     binding.manageProfileNameContainer.setOnClickListener { v: View -> findNavController(v).safeNavigate(EditProfileFragmentDirections.actionManageProfileName()) }
 
     binding.manageProfileUsernameContainer.setOnClickListener { v: View ->
-      if (SignalStore.uiHints().hasSeenUsernameEducation()) {
+      if (SignalStore.uiHints().hasSeenUsernameEducation() || SignalStore.account().username != null) {
         if (SignalStore.account().username != null) {
           MaterialAlertDialogBuilder(requireContext(), R.style.ThemeOverlay_Signal_MaterialAlertDialog_List)
             .setItems(R.array.username_edit_entries) { _: DialogInterface?, w: Int ->