diff --git a/res/xml/wifi_configure_settings.xml b/res/xml/wifi_configure_settings.xml
index 66c91400910..ad5315de3c2 100644
--- a/res/xml/wifi_configure_settings.xml
+++ b/res/xml/wifi_configure_settings.xml
@@ -17,12 +17,10 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/wifi_configure_titlebar">
 
-    <!-- android:dependency="enable_wifi" -->
-    <ListPreference
-        android:key="sleep_policy"
-        android:title="@string/wifi_setting_sleep_policy_title"
-        android:entries="@array/wifi_sleep_policy_entries"
-        android:entryValues="@array/wifi_sleep_policy_values" />
+    <SwitchPreference
+            android:key="enable_wifi_wakeup"
+            android:title="@string/wifi_wakeup"
+            android:summary="@string/wifi_wakeup_summary" />
 
     <SwitchPreference
       android:key="allow_recommendations"
@@ -34,23 +32,16 @@
         android:title="@string/wifi_notify_open_networks"
         android:summary="@string/wifi_notify_open_networks_summary" />
 
-    <SwitchPreference
-        android:key="enable_wifi_wakeup"
-        android:title="@string/wifi_wakeup"
-        android:summary="@string/wifi_wakeup_summary" />
-
     <SwitchPreference
         android:key="wifi_cellular_data_fallback"
         android:title="@string/wifi_cellular_data_fallback_title"
         android:summary="@string/wifi_cellular_data_fallback_summary"/>
 
-    <Preference
-        android:key="mac_address"
-        android:title="@string/wifi_advanced_mac_address_title"/>
-
-    <Preference
-        android:key="current_ip_address"
-        android:title="@string/wifi_advanced_ip_address_title"/>
+    <ListPreference
+            android:key="sleep_policy"
+            android:title="@string/wifi_setting_sleep_policy_title"
+            android:entries="@array/wifi_sleep_policy_entries"
+            android:entryValues="@array/wifi_sleep_policy_values" />
 
     <Preference
             android:key="install_credentials"
@@ -77,4 +68,12 @@
             android:key="wps_pin_entry"
             android:title="@string/wifi_menu_wps_pin" />
 
+    <Preference
+            android:key="mac_address"
+            android:title="@string/wifi_advanced_mac_address_title"/>
+
+    <Preference
+            android:key="current_ip_address"
+            android:title="@string/wifi_advanced_ip_address_title"/>
+
 </PreferenceScreen>
diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java
index 5fd3eeb0a6f..2b4743fea48 100644
--- a/src/com/android/settings/wifi/ConfigureWifiSettings.java
+++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java
@@ -49,6 +49,12 @@ public class ConfigureWifiSettings extends DashboardFragment {
         return TAG;
     }
 
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mProgressiveDisclosureMixin.setTileLimit(5);
+    }
+
     @Override
     protected int getPreferenceScreenResId() {
         return R.xml.wifi_configure_settings;