diff --git a/hshassets/forms/utils.py b/hshassets/forms/utils.py
index daa637c012ea36777a15d3d9c97e04b1c2e6f50e..af195b94a2f035736dc2a0458022f430433ad546 100644
--- a/hshassets/forms/utils.py
+++ b/hshassets/forms/utils.py
@@ -107,7 +107,8 @@ class BulmaFieldMarkup(object):
             css_classes = 'select is-multiple'
         else:
             css_classes = 'select'
-
+        if field.errors:
+            css_classes += " is-danger"
         return cls.label(field.label, cls.div_control(format_html('<div class="{}">{}</div>', css_classes, content)))
 
     @classmethod
diff --git a/hshassets/templatetags/bulma.py b/hshassets/templatetags/bulma.py
index 0d2d35bf7a94063eaa685cb938389696fed12f7f..6e831d719c8740114f5c8be3623484f8adb93cdb 100644
--- a/hshassets/templatetags/bulma.py
+++ b/hshassets/templatetags/bulma.py
@@ -26,11 +26,6 @@ def bulma_form_fields(form):
         elif isinstance(field.field.widget, widgets.Textarea):
             widget_classes.append("textarea")
 
-        # highlight fields with errors
-        if field.errors:
-            widget_classes.append("is-danger")
-
-        # done
         if field.field.widget.attrs.get('class'):
             widget_classes.append(field.field.widget.attrs['class'])