diff --git a/core/res/res/layout/preference_dialog_edittext.xml b/core/res/res/layout/preference_dialog_edittext.xml
index 5cc1ea266a738..b41e7745c7be8 100644
--- a/core/res/res/layout/preference_dialog_edittext.xml
+++ b/core/res/res/layout/preference_dialog_edittext.xml
@@ -15,17 +15,24 @@
 -->
 
 <!-- Layout used as the dialog's content View for EditTextPreference. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+android:id/edittext_container"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:padding="5dip"
-    android:orientation="vertical">
-    
-    <TextView android:id="@+android:id/message"
-        style="?android:attr/textAppearanceSmall"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:overscrollMode="ifContentScrolls">
+
+    <LinearLayout
+        android:id="@+android:id/edittext_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="?android:attr/textColorSecondary" />
-        
-</LinearLayout>
+        android:padding="5dip"
+        android:orientation="vertical">
+
+        <TextView android:id="@+android:id/message"
+            style="?android:attr/textAppearanceSmall"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="?android:attr/textColorSecondary" />
+            
+    </LinearLayout>
+
+</ScrollView>