diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
index 72da2e9..b8fb07d 100644
--- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
+++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
@@ -101,7 +101,7 @@
         Collections.sort(accessPoints, new Comparator<AccessPoint>() {
             public int compare(AccessPoint ap1, AccessPoint ap2) {
                 if (ap1.getConfigName() != null) {
-                    return ap1.getConfigName().compareTo(ap2.getConfigName());
+                    return ap1.getConfigName().compareToIgnoreCase(ap2.getConfigName());
                 } else {
                     return -1;
                 }
