diff --git a/src/com/android/settings/notification/ZenAccessSettings.java b/src/com/android/settings/notification/ZenAccessSettings.java
index d92bc5a5096..ec378f33741 100644
--- a/src/com/android/settings/notification/ZenAccessSettings.java
+++ b/src/com/android/settings/notification/ZenAccessSettings.java
@@ -137,6 +137,7 @@ public class ZenAccessSettings extends EmptyTextSettings {
             final String pkg = app.packageName;
             final CharSequence label = app.loadLabel(mPkgMan);
             final SwitchPreference pref = new AppSwitchPreference(getPrefContext());
+            pref.setKey(pkg);
             pref.setPersistent(false);
             pref.setIcon(app.loadIcon(mPkgMan));
             pref.setTitle(label);
diff --git a/src/com/android/settings/utils/ManagedServiceSettings.java b/src/com/android/settings/utils/ManagedServiceSettings.java
index d22234549ec..e89757cb2ec 100644
--- a/src/com/android/settings/utils/ManagedServiceSettings.java
+++ b/src/com/android/settings/utils/ManagedServiceSettings.java
@@ -143,8 +143,10 @@ public abstract class ManagedServiceSettings extends EmptyTextSettings {
                 final boolean enable = (boolean) newValue;
                 return setEnabled(cn, summary, enable);
             });
+            pref.setKey(cn.flattenToString());
             screen.addPreference(pref);
         }
+        highlightPreferenceIfNeeded();
     }
 
     private int getCurrentUser(int managedProfileId) {