diff --git a/src/com/android/phone/NetworkSetting.java b/src/com/android/phone/NetworkSetting.java
index 392db56..ad2fea3 100644
--- a/src/com/android/phone/NetworkSetting.java
+++ b/src/com/android/phone/NetworkSetting.java
@@ -45,6 +45,8 @@
 
 import java.util.HashMap;
 import java.util.List;
+import android.text.BidiFormatter;
+import android.text.TextDirectionHeuristics;
 
 /**
  * "Networks" settings UI for the Phone app.
@@ -479,7 +481,6 @@
 
                     if (DBG) log("  " + ni);
                 }
-
             } else {
                 displayEmptyNetworkList(true);
             }
@@ -501,7 +502,8 @@
         } else if (!TextUtils.isEmpty(ni.getOperatorAlphaShort())) {
             return ni.getOperatorAlphaShort();
         } else {
-            return ni.getOperatorNumeric();
+            BidiFormatter bidiFormatter = BidiFormatter.getInstance();
+            return bidiFormatter.unicodeWrap(ni.getOperatorNumeric(), TextDirectionHeuristics.LTR);
         }
     }
 
