diff --git a/sites/all/modules/contrib/conditional_fields/includes/conditional_fields.admin.inc b/sites/all/modules/contrib/conditional_fields/includes/conditional_fields.admin.inc
index 5cba6e3..21bf6c3 100644
--- a/sites/all/modules/contrib/conditional_fields/includes/conditional_fields.admin.inc
+++ b/sites/all/modules/contrib/conditional_fields/includes/conditional_fields.admin.inc
@@ -152,7 +152,7 @@ function conditional_fields_dependency_add_form($form, &$form_state, $entity_typ
         // first row they will appear grouped.
         if ($first_row == TRUE) {
           $form['table']['dependencies'][$id]['dependent'] = array(
-            '#markup' => check_plain($instances[$dependent]['label']) . ' (' . $dependent . ')',
+            '#markup' => truncate_utf8(check_plain($instances[$dependent]['label']), 25, TRUE, TRUE) . ' (' . $dependent . ')',
             '#rowspan' => $dependee_count,
           );
 
@@ -161,7 +161,7 @@ function conditional_fields_dependency_add_form($form, &$form_state, $entity_typ
 
         $row = array(
           'dependee' => array(
-            '#markup' => check_plain($instances[$dependency['dependee']]['label']) . ' (' . $dependency['dependee'] . ')',
+            '#markup' => truncate_utf8(check_plain($instances[$dependency['dependee']]['label']), 25, TRUE, TRUE) . ' (' . $dependency['dependee'] . ')',
           ),
         );
 
@@ -180,7 +180,7 @@ function conditional_fields_dependency_add_form($form, &$form_state, $entity_typ
           $row['description']['#colspan'] = 2;
         }
 
-        $row['description']['#markup'] = conditional_fields_dependency_description($instances[$dependency['dependee']]['label'], $instances[$dependent]['label'], $dependency['options']);
+        $row['description']['#markup'] = conditional_fields_dependency_description(truncate_utf8($instances[$dependency['dependee']]['label'], 25, TRUE, TRUE), truncate_utf8($instances[$dependent]['label'], 25, TRUE, TRUE), $dependency['options']);
 
         $row['edit'] = array(
           '#type' => 'link',
@@ -205,7 +205,7 @@ function conditional_fields_dependency_add_form($form, &$form_state, $entity_typ
   $fields = array();
 
   foreach ($instances as $field) {
-    $fields[$field['id']] = check_plain($field['label'] . ' (' . $field['field_name'] . ')');
+    $fields[$field['id']] = truncate_utf8($field['label'], 25, TRUE, TRUE) . ' (' . $field['field_name'] . ')';
   }
 
   asort($fields);