diff --git a/core/includes/form.inc b/core/includes/form.inc
index ff4175f..c139279 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -1348,6 +1348,7 @@ function form_pre_render_conditional_form_element($element) {
 
   if (isset($element['#title']) || isset($element['#description'])) {
     // @see #type 'fieldgroup'
+    $element['#theme_wrappers'][] = 'form_element';
     $element['#theme_wrappers'][] = 'fieldset';
     $element['#attributes']['class'][] = 'fieldgroup';
     $element['#attributes']['class'][] = 'form-composite';