diff --git a/data_entity/views/data_entity_views_handler_field_edit_link.inc b/data_entity/views/data_entity_views_handler_field_edit_link.inc
index fa24cb39..2047a390 100644
--- a/data_entity/views/data_entity_views_handler_field_edit_link.inc
+++ b/data_entity/views/data_entity_views_handler_field_edit_link.inc
@@ -7,7 +7,7 @@
 /**
  * Provides a field handler that links to a data table entity's edit form.
  */
-class data_entity_views_handler_field_edit_link extends views_handler_field {
+class data_entity_views_handler_field_edit_link extends views_handler_field_node_link_edit {
   function query() {
     // Fake field, do nothing.
   }
@@ -32,6 +32,6 @@ class data_entity_views_handler_field_edit_link extends views_handler_field {
     $this->options['alter']['path'] = 'admin/content/data/entity/' . $table . '/' . $entity_id;
     $this->options['alter']['query'] = drupal_get_destination();
 
-    return t('edit item');
+    return !empty($this->options['text']) ? $this->tokenize_value($this->options['text']) : t('edit item');
   }
 }