diff --git a/modules/field/modules/text/text.module b/modules/field/modules/text/text.module
index 6f46115b31f8ca6fd5d803b9554d27eef4baa36e..471173ab95157d51381b94873f5a14ae2c25a8bc 100644
--- a/modules/field/modules/text/text.module
+++ b/modules/field/modules/text/text.module
@@ -524,6 +524,7 @@ function text_field_widget_form(&$form, &$form_state, $field, $instance, $langco
         '#type' => 'textfield',
         '#default_value' => isset($items[$delta]['value']) ? $items[$delta]['value'] : NULL,
         '#size' => $instance['widget']['settings']['size'],
+        '#maxlength' => $field['settings']['max_length'],
         '#attributes' => array('class' => array('text-full')),
       );
       break;