diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index a2f5013b7..c3f2269e2 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -2725,6 +2725,11 @@ class ConnectCableToDeviceForm(BootstrapMixin, ChainedFieldsMixin, forms.ModelFo
             'termination_b_site', 'termination_b_rack', 'termination_b_device', 'termination_b_id', 'type', 'status',
             'label', 'color', 'length', 'length_unit',
         ]
+        widgets = {
+            'type': StaticSelect2(),
+            'status': StaticSelect2(),
+            'length_unit': StaticSelect2(),
+        }
 
     def __init__(self, *args, **kwargs):
 
@@ -2929,6 +2934,11 @@ class CableForm(BootstrapMixin, forms.ModelForm):
         fields = [
             'type', 'status', 'label', 'color', 'length', 'length_unit',
         ]
+        widgets = {
+            'type': StaticSelect2(),
+            'status': StaticSelect2(),
+            'length_unit': StaticSelect2(),
+        }
 
 
 class CableCSVForm(forms.ModelForm):
diff --git a/netbox/templates/dcim/cable_connect.html b/netbox/templates/dcim/cable_connect.html
index b1609f578..3aaa315c8 100644
--- a/netbox/templates/dcim/cable_connect.html
+++ b/netbox/templates/dcim/cable_connect.html
@@ -154,10 +154,10 @@
                         {% render_field form.color %}
                         <div class="form-group">
                             <label class="col-md-3 control-label" for="id_length">{{ form.length.label }}</label>
-                            <div class="col-md-6">
+                            <div class="col-md-5">
                                 {{ form.length }}
                             </div>
-                            <div class="col-md-3">
+                            <div class="col-md-4">
                                 {{ form.length_unit }}
                             </div>
                         </div>
diff --git a/netbox/templates/dcim/cable_edit.html b/netbox/templates/dcim/cable_edit.html
index 17403a07d..b3813a867 100644
--- a/netbox/templates/dcim/cable_edit.html
+++ b/netbox/templates/dcim/cable_edit.html
@@ -11,10 +11,10 @@
             {% render_field form.color %}
             <div class="form-group">
                 <label class="col-md-3 control-label" for="id_length">{{ form.length.label }}</label>
-                <div class="col-md-6">
+                <div class="col-md-5">
                     {{ form.length }}
                 </div>
-                <div class="col-md-3">
+                <div class="col-md-4">
                     {{ form.length_unit }}
                 </div>
             </div>