diff --git a/src/com/android/phone/EditPhoneNumberPreference.java b/src/com/android/phone/EditPhoneNumberPreference.java
index 8a672f1..78e8439 100644
--- a/src/com/android/phone/EditPhoneNumberPreference.java
+++ b/src/com/android/phone/EditPhoneNumberPreference.java
@@ -25,6 +25,8 @@
 import android.preference.EditTextPreference;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.telephony.PhoneNumberUtils;
+import android.text.BidiFormatter;
+import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
 import android.text.method.ArrowKeyMovementMethod;
 import android.text.method.DialerKeyListener;
@@ -206,7 +208,8 @@
                     mPhoneNumber = defaultNumber;
                 }
             }
-            editText.setText(mPhoneNumber);
+            editText.setText(BidiFormatter.getInstance().unicodeWrap(
+                    mPhoneNumber, TextDirectionHeuristics.LTR));
             editText.setMovementMethod(ArrowKeyMovementMethod.getInstance());
             editText.setKeyListener(DialerKeyListener.getInstance());
             editText.setOnFocusChangeListener(mDialogFocusChangeListener);