diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index d0f6f2eb4bd..4c310e6f4af 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -184,6 +184,7 @@ public class AppNotificationSettings extends NotificationSettingsBase {
                     channelPref.setKey(channel.getId());
                     channelPref.setTitle(channel.getName());
                     channelPref.setChecked(channel.getImportance() != IMPORTANCE_NONE);
+                    channelPref.setMultiLine(true);
 
                     if (channel.isDeleted()) {
                         channelPref.setTitle(
diff --git a/src/com/android/settings/widget/MasterSwitchPreference.java b/src/com/android/settings/widget/MasterSwitchPreference.java
index 94c429bb6b0..ba3458aa4e4 100644
--- a/src/com/android/settings/widget/MasterSwitchPreference.java
+++ b/src/com/android/settings/widget/MasterSwitchPreference.java
@@ -22,6 +22,7 @@ import android.support.v7.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.widget.CompoundButton;
 import android.widget.Switch;
+import android.widget.TextView;
 
 import com.android.settings.R;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -34,6 +35,7 @@ public class MasterSwitchPreference extends Preference {
 
     private Switch mSwitch;
     private boolean mChecked;
+    private boolean mMultiLine;
 
     public MasterSwitchPreference(Context context, AttributeSet attrs,
             int defStyleAttr, int defStyleRes) {
@@ -74,6 +76,12 @@ public class MasterSwitchPreference extends Preference {
                 }
             });
         }
+        if (mMultiLine) {
+            TextView textView = (TextView)holder.findViewById(android.R.id.title);
+            if (textView != null) {
+                textView.setSingleLine(false);
+            }
+        }
     }
 
     public boolean isChecked() {
@@ -97,6 +105,14 @@ public class MasterSwitchPreference extends Preference {
         }
     }
 
+    public boolean isMultiLine() {
+        return mMultiLine;
+    }
+
+    public void setMultiLine(boolean multiLine) {
+        mMultiLine = multiLine;
+    }
+
     /**
      * If admin is not null, disables the switch.
      * Otherwise, keep it enabled.