diff --git a/includes/form.inc b/includes/form.inc
index b45f53c..6ac32d9 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -38,8 +38,15 @@ function bootstrap_form_element(&$variables) {
     $attributes['id'] = $element['#id'];
   }
 
+  $exclude_control = FALSE;
+  $control_wrapper = '<div class="controls">';
   // Add bootstrap class
-  $attributes['class'] = array('control-group');
+  if ($element['#type'] == "radio" || $element['#type'] == "checkbox") {
+    $exclude_control = TRUE;
+  }
+  else {
+    $attributes['class'] = array('control-group');
+  }
 
   // Check for errors and set correct error class
   if (isset($element['#parents']) && form_get_error($element)) {
@@ -79,13 +86,13 @@ function bootstrap_form_element(&$variables) {
         $exclude_control = TRUE;
       }
       else {
-        $output .= '<div class="controls">';
+        $output = $exclude_control ? $output : $output.$control_wrapper;
         $output .= ' ' . $prefix . $element['#children'] . $suffix . "\n";
       }
       break;
 
     case 'after':
-      $output .= '<div class="controls">';
+      $output = $exclude_control ? $output : $output.$control_wrapper;
       $variables['#children'] = ' ' . $prefix . $element['#children'] . $suffix;
       $output .= ' ' . theme('form_element_label', $variables) . "\n";
       break;
@@ -93,7 +100,7 @@ function bootstrap_form_element(&$variables) {
     case 'none':
     case 'attribute':
       // Output no label and no required marker, only the children.
-      $output .= '<div class="controls">';
+      $output = $exclude_control ? $output : $output.$control_wrapper;
       $output .= ' ' . $prefix . $element['#children'] . $suffix . "\n";
       break;
   }
@@ -103,7 +110,7 @@ function bootstrap_form_element(&$variables) {
   }
 
   // Check if control wrapper was added to ensure we close div correctly
-  if (!empty($exclude_control)) {
+  if ($exclude_control) {
     $output .= "</div>\n";
   }
   else {