diff --git a/res/xml/security_settings_encryption_interstitial.xml b/res/xml/security_settings_encryption_interstitial.xml
index 37ac81512c6..576cbf0c53a 100644
--- a/res/xml/security_settings_encryption_interstitial.xml
+++ b/res/xml/security_settings_encryption_interstitial.xml
@@ -19,7 +19,7 @@
     android:title="@string/lock_settings_picker_title"
     android:key="lock_settings_picker">
 
-    <Preference
+    <com.android.settings.MultiLinePreference
         android:icon="@drawable/ic_lock_list_icon"
         android:key="encrypt_require_password"
         android:persistent="false"/>
diff --git a/src/com/android/settings/MultiLinePreference.java b/src/com/android/settings/MultiLinePreference.java
new file mode 100644
index 00000000000..fff6b2446f3
--- /dev/null
+++ b/src/com/android/settings/MultiLinePreference.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.TextView;
+
+public class MultiLinePreference extends Preference {
+
+    public MultiLinePreference(Context ctx, AttributeSet attrs, int defStyle) {
+        super(ctx, attrs, defStyle);
+    }
+
+    public MultiLinePreference(Context ctx, AttributeSet attrs) {
+        super(ctx, attrs);
+    }
+
+    public MultiLinePreference(Context ctx) {
+        super(ctx);
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder view) {
+        super.onBindViewHolder(view);
+
+        TextView textView = (TextView) view.findViewById(android.R.id.title);
+        if (textView != null) {
+            textView.setSingleLine(false);
+        }
+    }
+}