diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeViewModel.kt
index 64132d8802..2025dc609d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryCodeViewModel.kt
@@ -35,7 +35,7 @@ class CountryCodeViewModel : ViewModel() {
           query = filterBy,
           filteredList = state.value.countryList.filter { country: Country ->
             country.name.contains(filterBy, ignoreCase = true) ||
-              country.countryCode.toString().contains(filterBy) ||
+              country.countryCode.toString().contains(filterBy.removePrefix("+")) ||
               (filterBy.equals("usa", ignoreCase = true) && country.name.equals("United States", ignoreCase = true))
           }
         )