diff --git a/field_collection.module b/field_collection.module
index bf6a005..be78c67 100644
--- a/field_collection.module
+++ b/field_collection.module
@@ -1233,6 +1233,9 @@ function field_collection_field_formatter_view($entity_type, $entity, $field, $i
         }
       }
       field_collection_field_formatter_links($element, $entity_type, $entity, $field, $instance, $langcode, $items, $display);
+      $element += array('#prefix' => '', '#suffix' => '');
+      $element['#prefix'] .= '<div class="field-collection-container clearfix field-collection-container-' . drupal_html_class($field['field_name']) . '">';
+      $element['#suffix'] .= '</div>';
       break;
 
     case 'field_collection_fields':
@@ -1280,10 +1283,6 @@ function field_collection_field_formatter_links(&$element, $entity_type, $entity
     $element[$index]['#attributes']['class'][] = 'field-collection-view-final';
   }
 
-  $element += array('#prefix' => '', '#suffix' => '');
-  $element['#prefix'] .= '<div class="field-collection-container clearfix">';
-  $element['#suffix'] .= '</div>';
-
   return $element;
 }