diff --cc file_entity.module
index e93cfea,da42e9a..0000000
--- a/file_entity.module
+++ b/file_entity.module
@@@ -214,21 -227,14 +227,22 @@@ function file_entity_entity_info_alter(
    $entity_info['file']['fieldable'] = TRUE;
    $entity_info['file']['entity keys']['bundle'] = 'type';
    $entity_info['file']['bundles'] = array();
 -  foreach (file_type_get_types() as $type => $info) {
 -    $info['admin'] = array(
 -      'path' => 'admin/config/media/file-types/manage/%',
 -      'real path' => 'admin/config/media/file-types/manage/' . $type,
 -      'bundle argument' => 5,
 +  $entity_info['file']['view modes']['full'] = array(
 +    'label' => t('File view page'),
 +    'custom settings' => FALSE,
 +  );
 +  foreach (file_info_file_types() as $type => $info) {
 +    $info += array(
 +      // Provide a default administration path for Field UI, but not if 'admin'
 +      // has been explicitly set to NULL.
 +      'admin' => array(
 +        'path' => 'admin/config/media/file-types/manage/%',
 +        'real path' => 'admin/config/media/file-types/manage/' . $type,
 +        'bundle argument' => 5,
 +      ),
      );
-     $entity_info['file']['bundles'][$type] = array_intersect_key($info, drupal_map_assoc(array('label', 'admin')));
+     $entity_info['file']['bundles'][$type]['name'] = $info['name'];
+     $entity_info['file']['bundles'][$type]['admin'] = $info['admin'];
      $entity_info['file']['view callback'] = 'file_view_multiple';
    }
  }