diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index 96ac392dd60..188cd30e89e 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -66,6 +66,8 @@ public class VpnSettings extends SettingsPreferenceFragment implements
 
     private static final String TAG_LOCKDOWN = "lockdown";
 
+    private static final String EXTRA_PICK_LOCKDOWN = "android.net.vpn.PICK_LOCKDOWN";
+
     // TODO: migrate to using DialogFragment when editing
 
     private final IConnectivityManager mService = IConnectivityManager.Stub
@@ -89,6 +91,12 @@ public class VpnSettings extends SettingsPreferenceFragment implements
         setHasOptionsMenu(true);
         addPreferencesFromResource(R.xml.vpn_settings2);
 
+        final boolean pickLockdown = getActivity()
+                .getIntent().getBooleanExtra(EXTRA_PICK_LOCKDOWN, false);
+        if (pickLockdown) {
+            LockdownConfigFragment.show(this);
+        }
+
         if (savedState != null) {
             VpnProfile profile = VpnProfile.decode(savedState.getString("VpnKey"),
                     savedState.getByteArray("VpnProfile"));