diff --git a/components/fieldset.inc b/components/fieldset.inc
index 763e521..eb4ac42 100644
--- a/components/fieldset.inc
+++ b/components/fieldset.inc
@@ -75,7 +75,7 @@ function _webform_render_fieldset($component, $value = NULL, $filter = TRUE, $su
  * Pre-render function to set a unique fieldset class name.
  */
 function webform_fieldset_prerender($element) {
-  $element['#id'] = NULL;
+  $element['#id'] = 'webform-component-' . str_replace('_', '-', implode('--', array_slice($element['#parents'], 1)));
   $element['#attributes']['class'][] = 'webform-component--' . str_replace('_', '-', implode('--', array_slice($element['#parents'], 1)));
   return $element;
 }