diff --git a/res/layout/user_dictionary_add_word.xml b/res/layout/user_dictionary_add_word.xml
index 25c61f709ba..7df97b7703d 100644
--- a/res/layout/user_dictionary_add_word.xml
+++ b/res/layout/user_dictionary_add_word.xml
@@ -51,6 +51,7 @@
               android:text="@string/user_dict_settings_add_word_option_name"
               android:visibility="gone" />
     <EditText android:id="@+id/user_dictionary_add_word_text"
+              android:maxLength="@integer/maximum_user_dictionary_word_length"
               android:layout_width="wrap_content"
               android:layout_gravity="fill_horizontal|center_vertical"
               android:layout_marginLeft="8dip"
@@ -68,6 +69,7 @@
               android:text="@string/user_dict_settings_add_shortcut_option_name"
               android:visibility="gone" />
     <EditText android:id="@+id/user_dictionary_settings_add_dialog_shortcut"
+              android:maxLength="@integer/maximum_user_dictionary_word_length"
               android:layout_width="wrap_content"
               android:layout_gravity="fill_horizontal|center_vertical"
               android:layout_marginLeft="8dip"
diff --git a/res/values/config.xml b/res/values/config.xml
index 4119b6a06ae..557dadb978d 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -22,4 +22,11 @@
     <string name="additional_system_update" translatable="false"></string>
     <string name="additional_system_update_menu" translatable="false"></string>
 
+    <!-- TODO: This is purely enforced by the interface, and does not affect what
+         strings may be inserted into the actual content provider.
+         With the addition of shortcuts, it seems more likely that users will
+         find this limiting; it would be good to have the interface work with
+         very long strings too. -->
+    <integer name="maximum_user_dictionary_word_length" translatable="false">48</integer>
+
 </resources>