--- select.inc.1.22.2.31	Thu Feb 11 12:28:50 2010
+++ select.inc	Thu Feb 11 12:36:21 2010
@@ -143,8 +143,6 @@ function _webform_render_select($compone
     '#required'      => $component['mandatory'],
     '#weight'        => $component['weight'],
     '#description'   => _webform_filter_descriptions($component['extra']['description']),
-    '#prefix'        => '<div class="webform-component-'. $component['type'] .'" id="webform-component-'. $component['form_key'] .'">',
-    '#suffix'        => '</div>',
   );
 
   // Convert the user-entered options list into an array.
@@ -191,6 +189,9 @@ function _webform_render_select($compone
       $form_item['#type'] = 'radios';
     }
   }
+  $form_item['#prefix'] = '<div class="webform-component-'. $component['type'] .' webform-component-'. $component['type'] .'-'. $form_item['#type'] .'" id="webform-component-'. $component['form_key'] .'">';
+  $form_item['#suffix'] = '</div>';
+
   return $form_item;
 }