diff --git a/src/com/android/settings/BrightnessPreference.java b/src/com/android/settings/BrightnessPreference.java
index e2fe0f2240e..2bba8148734 100644
--- a/src/com/android/settings/BrightnessPreference.java
+++ b/src/com/android/settings/BrightnessPreference.java
@@ -121,10 +121,11 @@ public class BrightnessPreference extends SeekBarPreference implements
                         mCheckBox.isChecked() ? 1 : 0);
             }
         } else {
-            setBrightness(mOldBrightness);
             if (mAutomaticAvailable) {
                 setMode(mOldAutomatic);
             }
+            // brightness needs to be restored after restoring ALS mode
+            setBrightness(mOldBrightness);
         }
     }