diff --git a/modules/upload.module b/modules/upload.module
index 9853032a462..bee42e1983c 100644
--- a/modules/upload.module
+++ b/modules/upload.module
@@ -380,12 +380,13 @@ function upload_form($node) {
   if (count($node->files)) {
     $output = theme('table', $header, $rows);
   }
+
   if (user_access('upload files')) {
     $output .= form_file(t('Attach new file'), "upload", 40);
     $output .= form_button(t('Attach'), 'fileop');
   }
 
-  return '<div class="attachments">'. form_group_collapsible(t('File attachments'), $output, TRUE, t('Changes made to the attachments are not permanent until you save this post.  The first "listed" file will be included in RSS feeds.')) .'</div>';
+  return '<div class="attachments">'. form_group_collapsible(t('File attachments'), $output, empty($node->files), t('Changes made to the attachments are not permanent until you save this post.  The first "listed" file will be included in RSS feeds.')) .'</div>';
 }
 
 function upload_load($node) {
diff --git a/modules/upload/upload.module b/modules/upload/upload.module
index 9853032a462..bee42e1983c 100644
--- a/modules/upload/upload.module
+++ b/modules/upload/upload.module
@@ -380,12 +380,13 @@ function upload_form($node) {
   if (count($node->files)) {
     $output = theme('table', $header, $rows);
   }
+
   if (user_access('upload files')) {
     $output .= form_file(t('Attach new file'), "upload", 40);
     $output .= form_button(t('Attach'), 'fileop');
   }
 
-  return '<div class="attachments">'. form_group_collapsible(t('File attachments'), $output, TRUE, t('Changes made to the attachments are not permanent until you save this post.  The first "listed" file will be included in RSS feeds.')) .'</div>';
+  return '<div class="attachments">'. form_group_collapsible(t('File attachments'), $output, empty($node->files), t('Changes made to the attachments are not permanent until you save this post.  The first "listed" file will be included in RSS feeds.')) .'</div>';
 }
 
 function upload_load($node) {