diff --git a/src/com/android/settings/wifi/WifiLayer.java b/src/com/android/settings/wifi/WifiLayer.java
index 5bcf81fd904..ce518e1d2a6 100644
--- a/src/com/android/settings/wifi/WifiLayer.java
+++ b/src/com/android/settings/wifi/WifiLayer.java
@@ -422,6 +422,17 @@ public class WifiLayer {
             return false;
         }
         
+        /*
+         * It's necessary to update the network id of this state because the network id
+         * could have changed after the configuration is saved. For example, if there are
+         * more than 10 saved open-networks, some older open-networks will have been be forgotten.
+         */
+        state.setNetworkId(AccessPointState.NETWORK_ID_ANY);
+        config = findConfiguredNetwork(state);
+        if (config != null) {
+            state.setNetworkId(config.networkId);
+        }
+
         /*
          * We could reload the configured networks, but instead just shortcut
          * and add this state to our list in memory