diff --git a/bootstrapform/templates/bootstrapform/field.html b/bootstrapform/templates/bootstrapform/field.html
index 100ff1d..e59fa6e 100644
--- a/bootstrapform/templates/bootstrapform/field.html
+++ b/bootstrapform/templates/bootstrapform/field.html
@@ -23,24 +23,24 @@
         <label class="control-label {{ classes.label }}">{{ field.label }}</label>
 
         <div class="{{ classes.value }}">
-            <div class="radio">
-                {% for choice in field %}
-                    <label class="radio">
+            {% for choice in field %}
+                <div class="radio">
+                    <label>
                         {{ choice.tag }}
                         {{ choice.choice_label }}
                     </label>
-                {% endfor %}
+                </div>
+            {% endfor %}
 
-                {% for error in field.errors %}
-                    <span class="help-block">{{ error }}</span>
-                {% endfor %}
+            {% for error in field.errors %}
+                <span class="help-block">{{ error }}</span>
+            {% endfor %}
 
-                {% if field.help_text %}
-                <p class="help-block">
-                    {{ field.help_text|safe }}
-                </p>
-                {% endif %}
-            </div>
+            {% if field.help_text %}
+            <p class="help-block">
+                {{ field.help_text|safe }}
+            </p>
+            {% endif %}
         </div>
 
     {% else %}
diff --git a/bootstrapform/templatetags/bootstrap.py b/bootstrapform/templatetags/bootstrap.py
index a9d8e33..3ab5aac 100644
--- a/bootstrapform/templatetags/bootstrap.py
+++ b/bootstrapform/templatetags/bootstrap.py
@@ -48,7 +48,7 @@ def bootstrap_horizontal(element, label_cols={}):
 
 
 def add_input_classes(field):
-    if not is_checkbox(field) and not is_multiple_checkbox(field):
+    if not is_checkbox(field) and not is_multiple_checkbox(field) and not is_radio(field):
         field_classes = field.field.widget.attrs.get('class', '')
         field_classes += ' form-control'
         field.field.widget.attrs['class'] = field_classes