diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 0150621b7e4..e86fbb8fe6d 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -19,11 +19,12 @@
         android:title="@string/display_settings"
         settings:keywords="@string/keywords_display">
 
-        <com.android.settings.BrightnessPreference
+        <PreferenceScreen
                 android:key="brightness"
                 android:title="@string/brightness"
-                settings:keywords="@string/keywords_display_brightness_level"
-                android:persistent="false"/>
+                settings:keywords="@string/keywords_display_brightness_level">
+            <intent android:action="android.intent.action.SHOW_BRIGHTNESS_DIALOG" />
+        </PreferenceScreen>
 
         <SwitchPreference
                 android:key="auto_brightness"
diff --git a/src/com/android/settings/BrightnessPreference.java b/src/com/android/settings/BrightnessPreference.java
index 6d3b81b10b9..7d60e7ff2c3 100644
--- a/src/com/android/settings/BrightnessPreference.java
+++ b/src/com/android/settings/BrightnessPreference.java
@@ -30,7 +30,7 @@ public class BrightnessPreference extends Preference {
 
     @Override
     protected void onClick() {
-        Intent intent = new Intent(Intent.ACTION_SHOW_BRIGHTNESS_DIALOG);
-        getContext().sendBroadcastAsUser(intent, UserHandle.CURRENT_OR_SELF);
+        getContext().startActivityAsUser(new Intent(Intent.ACTION_SHOW_BRIGHTNESS_DIALOG),
+                UserHandle.CURRENT_OR_SELF);
     }
 }