diff --git a/src/com/android/settings/display/AdaptiveSleepPreferenceController.java b/src/com/android/settings/display/AdaptiveSleepPreferenceController.java
index b86a070cf84..35f9c728264 100644
--- a/src/com/android/settings/display/AdaptiveSleepPreferenceController.java
+++ b/src/com/android/settings/display/AdaptiveSleepPreferenceController.java
@@ -90,6 +90,7 @@ public class AdaptiveSleepPreferenceController {
         if (enforcedAdmin != null) {
             mPreference.setDisabledByAdmin(enforcedAdmin);
         } else {
+            mPreference.setChecked(isChecked());
             mPreference.setEnabled(hasSufficientPermission(mPackageManager) && !isCameraLocked()
                     && !isPowerSaveMode());
         }
diff --git a/src/com/android/settings/display/ScreenTimeoutSettings.java b/src/com/android/settings/display/ScreenTimeoutSettings.java
index b4d120e4e83..66f5ed3dab4 100644
--- a/src/com/android/settings/display/ScreenTimeoutSettings.java
+++ b/src/com/android/settings/display/ScreenTimeoutSettings.java
@@ -81,6 +81,7 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements
         @Override
         public void onReceive(Context context, Intent intent) {
             mAdaptiveSleepBatterySaverPreferenceController.updateVisibility();
+            mAdaptiveSleepController.updatePreference();
         }
     };