diff --git a/modules/file/file.field.inc b/modules/file/file.field.inc
index b26d7e4..d96e32c 100644
--- a/modules/file/file.field.inc
+++ b/modules/file/file.field.inc
@@ -626,7 +626,7 @@ function file_field_widget_process($element, &$form_state, $form) {
   $element['#theme'] = 'file_widget';
 
   // Add the display field if enabled.
-  if (!empty($field['settings']['display_field']) && $item['fid']) {
+  if (!empty($field['settings']['display_field'])) {
     $element['display'] = array(
       '#type' => empty($item['fid']) ? 'hidden' : 'checkbox',
       '#title' => t('Include file in display'),
diff --git a/modules/file/tests/file.test b/modules/file/tests/file.test
index 0f6a578..6ce06c4 100644
--- a/modules/file/tests/file.test
+++ b/modules/file/tests/file.test
@@ -918,6 +918,33 @@ class FileFieldDisplayTestCase extends FileFieldTestCase {
     $this->assertNoRaw($default_output, 'Field is hidden when "display" option is unchecked.');
 
   }
+
+  /**
+   * Tests default display of File Field.
+   */
+  function testDefaultFileFieldDisplay() {
+    $field_name = strtolower($this->randomName());
+    $type_name = 'article';
+    $field_settings = array(
+      'display_field' => '1',
+      'display_default' => '0',
+    );
+    $instance_settings = array(
+      'description_field' => '1',
+    );
+    $widget_settings = array();
+    $this->createFileField($field_name, $type_name, $field_settings, $instance_settings, $widget_settings);
+    $field = field_info_field($field_name);
+    $instance = field_info_instance('node', $field_name, $type_name);
+
+    $test_file = $this->getTestFile('text');
+
+    // Create a new node with the uploaded file.
+    $nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
+
+    $this->drupalGet('node/' . $nid . '/edit');
+    $this->assertNoFieldByXPath('//input[@type="checkbox" and @name="' . $field_name . '[und][0][display]" and @checked="checked"]', NULL, 'Default file display is off.');
+  }
 }
 
 /**