addressfield.module | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addressfield.module b/addressfield.module
index 4b3f08b..cc186ac 100644
--- a/addressfield.module
+++ b/addressfield.module
@@ -378,7 +378,9 @@ function addressfield_element_process($element, &$form_state, $form) {
   $element['address'] = addressfield_generate($address, $element['#handlers'], $element['#context'], $element['#available_countries']);
   $element['address'] = addressfield_process_format_form($element['address'], $form_state, $form);
 
-  $element['address']['#type'] = (isset($element['#inline']) && $element['#inline'] == TRUE ? 'container' : 'fieldset');
+  $has_parent_widget_container = (isset($element['#context']['has_parent_widget_container']) && $element['#context']['has_parent_widget_container']);
+  $is_inline = (isset($element['#inline']) && $element['#inline'] == TRUE);
+  $element['address']['#type'] = ($has_parent_widget_container || $is_inline ? 'container' : 'fieldset');
   if (isset($element['#title'])) {
     $element['address']['#title'] = $element['#title'];
   }
@@ -679,6 +681,7 @@ function addressfield_field_widget_form(&$form, &$form_state, $field, $instance,
         'address' => $address,
         'langcode' => $langcode,
         'delta' => $delta,
+        'has_parent_widget_container' => TRUE,
       ),
       // Ensure the submitted value doesn't have the ['address'] index.
       '#parents' => array_merge($element['#field_parents'], array($element['#field_name'], $langcode, $delta)),