diff --git a/file_entity.field.inc b/file_entity.field.inc
index 43016ff..6eec0a1 100644
--- a/file_entity.field.inc
+++ b/file_entity.field.inc
@@ -93,6 +93,9 @@ function file_entity_field_formatter_view($entity_type, $entity, $field, $instan
     foreach ($items as $delta => $item) {
       if (!isset($recursion_queue[$item['fid']])) {
         $files_display[$item['fid']] = file_load($item['fid']);
+        if (!empty($item['description'])) {
+          $files_display[$item['fid']]->description = $item['description'];
+        }
       }
     }