diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index 1c82c29..ff3f066 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -1050,7 +1050,7 @@
             return;
         }
 
-        if (enable && mGsmUmtsOptions == null) {
+        if (mGsmUmtsOptions == null) {
             mGsmUmtsOptions = new GsmUmtsOptions(this, prefSet);
         }
         PreferenceScreen apnExpand =
@@ -1060,7 +1060,7 @@
         PreferenceScreen carrierSettings =
                 (PreferenceScreen) prefSet.findPreference(BUTTON_CARRIER_SETTINGS_KEY);
         if (apnExpand != null) {
-            apnExpand.setEnabled(enable);
+            apnExpand.setEnabled(isWorldMode() || enable);
         }
         if (operatorSelectionExpand != null) {
             operatorSelectionExpand.setEnabled(enable);