diff --git a/res/xml/security_settings_password_sub.xml b/res/xml/security_settings_password_sub.xml
index 0fa3731e78e..653dff83994 100644
--- a/res/xml/security_settings_password_sub.xml
+++ b/res/xml/security_settings_password_sub.xml
@@ -24,8 +24,7 @@
                 android:title="@string/lock_after_timeout"
                 android:summary="@string/lock_after_timeout_summary"
                 android:entries="@array/lock_after_timeout_entries"
-                android:entryValues="@array/lock_after_timeout_values"
-                android:persistent="false"/>
+                android:entryValues="@array/lock_after_timeout_values" />
 
         <SwitchPreference
                 android:key="power_button_instantly_locks"
diff --git a/res/xml/security_settings_pattern_sub.xml b/res/xml/security_settings_pattern_sub.xml
index adaaca64a05..cc6722f9fa3 100644
--- a/res/xml/security_settings_pattern_sub.xml
+++ b/res/xml/security_settings_pattern_sub.xml
@@ -28,8 +28,7 @@
                 android:title="@string/lock_after_timeout"
                 android:summary="@string/lock_after_timeout_summary"
                 android:entries="@array/lock_after_timeout_entries"
-                android:entryValues="@array/lock_after_timeout_values"
-                android:persistent="false"/>
+                android:entryValues="@array/lock_after_timeout_values" />
 
         <SwitchPreference
                 android:key="power_button_instantly_locks"
diff --git a/res/xml/security_settings_pin_sub.xml b/res/xml/security_settings_pin_sub.xml
index 6dff551bdc8..8a5f3b0b6e7 100644
--- a/res/xml/security_settings_pin_sub.xml
+++ b/res/xml/security_settings_pin_sub.xml
@@ -24,8 +24,7 @@
                 android:title="@string/lock_after_timeout"
                 android:summary="@string/lock_after_timeout_summary"
                 android:entries="@array/lock_after_timeout_entries"
-                android:entryValues="@array/lock_after_timeout_values"
-                android:persistent="false"/>
+                android:entryValues="@array/lock_after_timeout_values" />
 
         <SwitchPreference
                 android:key="power_button_instantly_locks"
diff --git a/src/com/android/settings/GearPreference.java b/src/com/android/settings/GearPreference.java
index a8c1e9d6693..30f9a685d03 100644
--- a/src/com/android/settings/GearPreference.java
+++ b/src/com/android/settings/GearPreference.java
@@ -36,6 +36,7 @@ public class GearPreference extends Preference implements View.OnClickListener {
 
     public void setOnGearClickListener(OnGearClickListener l) {
         mOnGearClickListener = l;
+        notifyChanged();
     }
 
     @Override