diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py
index 8285a7b96..35be15926 100644
--- a/netbox/utilities/forms.py
+++ b/netbox/utilities/forms.py
@@ -118,25 +118,15 @@ class SmallTextarea(forms.Textarea):
 
 
 class ColorSelect(forms.Select):
+    """
+    Extends the built-in Select widget to colorize each <option>.
+    """
+    option_template_name = 'colorselect_option.html'
 
     def __init__(self, *args, **kwargs):
         kwargs['choices'] = COLOR_CHOICES
         super(ColorSelect, self).__init__(*args, **kwargs)
 
-    def render_option(self, selected_choices, option_value, option_label):
-        if option_value is None:
-            option_value = ''
-        option_value = force_text(option_value)
-        if option_value in selected_choices:
-            selected_html = mark_safe(' selected')
-            if not self.allow_multiple_selected:
-                # Only allow for a single selection.
-                selected_choices.remove(option_value)
-        else:
-            selected_html = ''
-        return format_html('<option value="{}"{} style="background-color: #{}">{}</option>',
-                           option_value, selected_html, option_value, force_text(option_label))
-
 
 class SelectWithDisabled(forms.Select):
     """
diff --git a/netbox/utilities/templates/colorselect_option.html b/netbox/utilities/templates/colorselect_option.html
new file mode 100644
index 000000000..7d10b893f
--- /dev/null
+++ b/netbox/utilities/templates/colorselect_option.html
@@ -0,0 +1 @@
+<option value="{{ widget.value }}"{% include "django/forms/widgets/attrs.html" %} style="background-color: #{{ widget.value }}">{{ widget.label }}</option>