diff --git a/src/com/android/dialer/filterednumber/BlockedNumbersAdapter.java b/src/com/android/dialer/filterednumber/BlockedNumbersAdapter.java
index be83df7..ce96b67 100644
--- a/src/com/android/dialer/filterednumber/BlockedNumbersAdapter.java
+++ b/src/com/android/dialer/filterednumber/BlockedNumbersAdapter.java
@@ -18,6 +18,7 @@
 import android.app.FragmentManager;
 import android.content.Context;
 import android.database.Cursor;
+import android.telephony.PhoneNumberUtils;
 import android.view.View;
 
 import com.android.contacts.common.ContactPhotoManager;
@@ -64,7 +65,7 @@
                         id,
                         number,
                         countryIso,
-                        number,
+                        PhoneNumberUtils.formatNumber(number, countryIso),
                         R.id.blocked_number_fragment,
                         getFragmentManager(),
                         null /* callback */);
diff --git a/src/com/android/dialer/list/BlockedListSearchFragment.java b/src/com/android/dialer/list/BlockedListSearchFragment.java
index 717cf9e..daa384a 100644
--- a/src/com/android/dialer/list/BlockedListSearchFragment.java
+++ b/src/com/android/dialer/list/BlockedListSearchFragment.java
@@ -19,6 +19,7 @@
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
+import android.telephony.PhoneNumberUtils;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -175,7 +176,7 @@
                             id,
                             number,
                             countryIso,
-                            number,
+                            PhoneNumberUtils.formatNumber(number, countryIso),
                             R.id.blocked_numbers_activity_container,
                             getFragmentManager(),
                             BlockedListSearchFragment.this);
