diff --git a/netbox/circuits/forms.py b/netbox/circuits/forms.py
index 6a2577edb..18d49d08e 100644
--- a/netbox/circuits/forms.py
+++ b/netbox/circuits/forms.py
@@ -338,4 +338,6 @@ class CircuitTerminationForm(BootstrapMixin, forms.ModelForm):
         }
         widgets = {
             'term_side': forms.HiddenInput(),
+            'port_speed': SelectSpeedWidget(),
+            'upstream_speed': SelectSpeedWidget(),
         }
diff --git a/netbox/templates/circuits/circuittermination_edit.html b/netbox/templates/circuits/circuittermination_edit.html
index 43dba8438..917fca970 100644
--- a/netbox/templates/circuits/circuittermination_edit.html
+++ b/netbox/templates/circuits/circuittermination_edit.html
@@ -1,97 +1,43 @@
-{% extends 'base.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load static %}
 {% load form_helpers %}
 
-{% block content %}
-    <form action="." method="post" class="form form-horizontal">
-        {% csrf_token %}
-        {% for field in form.hidden_fields %}
-            {{ field }}
-        {% endfor %}
-        <div class="row">
-            <div class="col-md-6 col-md-offset-3">
-                <h3>{% block title %}{{ obj.circuit.provider }} {{ obj.circuit }} - Side {{ form.term_side.value }}{% endblock %}</h3>
-                {% if form.non_field_errors %}
-                    <div class="panel panel-danger">
-                        <div class="panel-heading"><strong>Errors</strong></div>
-                        <div class="panel-body">
-                            {{ form.non_field_errors }}
-                        </div>
-                    </div>
-                {% endif %}
-                <div class="panel panel-default">
-                    <div class="panel-heading"><strong>Location</strong></div>
-                    <div class="panel-body">
-                        <div class="form-group">
-                            <label class="col-md-3 control-label">Provider</label>
-                            <div class="col-md-9">
-                                <p class="form-control-static">{{ obj.circuit.provider }}</p>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label class="col-md-3 control-label">Circuit</label>
-                            <div class="col-md-9">
-                                <p class="form-control-static">{{ obj.circuit.cid }}</p>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label class="col-md-3 control-label">Termination</label>
-                            <div class="col-md-9">
-                                <p class="form-control-static">{{ form.term_side.value }}</p>
-                            </div>
-                        </div>
-                        {% render_field form.region %}
-                        {% render_field form.site %}
-                    </div>
-                </div>
-                <div class="panel panel-default">
-                    <div class="panel-heading"><strong>Termination Details</strong></div>
-                    <div class="panel-body">
-                        <div class="form-group">
-                            <label class="col-md-3 control-label" for="id_port_speed">{{ form.port_speed.label }}</label>
-                            <div class="col-md-9">
-                                <div class="input-group">
-                                    {{ form.port_speed }}
-                                    {% include 'circuits/inc/speed_widget.html' with target_field='port_speed' %}
-                                </div>
-                                <span class="help-block">{{ form.port_speed.help_text }}</span>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label class="col-md-3 control-label" for="id_upstream_speed">{{ form.upstream_speed.label }}</label>
-                            <div class="col-md-9">
-                                <div class="input-group">
-                                    {{ form.upstream_speed }}
-                                    {% include 'circuits/inc/speed_widget.html' with target_field='upstream_speed' %}
-                                </div>
-                                <span class="help-block">{{ form.upstream_speed.help_text }}</span>
-                            </div>
-                        </div>
-                        {% render_field form.xconnect_id %}
-                        {% render_field form.pp_info %}
-                        {% render_field form.description %}
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-md-6 col-md-offset-3 text-right">
-                {% if obj.pk %}
-                    <button type="submit" name="_update" class="btn btn-primary">Update</button>
-                {% else %}
-                    <button type="submit" name="_create" class="btn btn-primary">Create</button>
-                {% endif %}
-                <a href="{{ return_url }}" class="btn btn-default">Cancel</a>
-            </div>
-        </div>
-    </form>
-{% endblock %}
+{% block title %}{{ obj.circuit.provider }} {{ obj.circuit }} - Side {{ form.term_side.value }}{% endblock %}
 
-{% block javascript %}
-<script type="text/javascript">
-    $("a.set_speed").click(function(e) {
-        e.preventDefault();
-        $("#id_" + $(this).attr("target")).val($(this).attr("data"));
-    });
-</script>
+{% block form %}
+  <div class="panel panel-default">
+      <div class="panel-heading"><strong>Location</strong></div>
+      <div class="panel-body">
+          <div class="form-group">
+              <label class="col-md-3 control-label">Provider</label>
+              <div class="col-md-9">
+                  <p class="form-control-static">{{ obj.circuit.provider }}</p>
+              </div>
+          </div>
+          <div class="form-group">
+              <label class="col-md-3 control-label">Circuit</label>
+              <div class="col-md-9">
+                  <p class="form-control-static">{{ obj.circuit.cid }}</p>
+              </div>
+          </div>
+          <div class="form-group">
+              <label class="col-md-3 control-label">Termination</label>
+              <div class="col-md-9">
+                  <p class="form-control-static">{{ form.term_side.value }}</p>
+              </div>
+          </div>
+          {% render_field form.region %}
+          {% render_field form.site %}
+      </div>
+  </div>
+  <div class="panel panel-default">
+      <div class="panel-heading"><strong>Termination Details</strong></div>
+      <div class="panel-body">
+          {% render_field form.port_speed %}
+          {% render_field form.upstream_speed %}
+          {% render_field form.xconnect_id %}
+          {% render_field form.pp_info %}
+          {% render_field form.description %}
+      </div>
+  </div>
 {% endblock %}
diff --git a/netbox/templates/circuits/inc/speed_widget.html b/netbox/templates/circuits/inc/speed_widget.html
deleted file mode 100644
index 988418945..000000000
--- a/netbox/templates/circuits/inc/speed_widget.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<span class="input-group-btn">
-    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-        <span class="caret"></span>
-    </button>
-    <ul class="dropdown-menu dropdown-menu-right">
-        <li><a href="#" target="{{ target_field }}" data="10000" class="set_speed">10 Mbps</a></li>
-        <li><a href="#" target="{{ target_field }}" data="100000" class="set_speed">100 Mbps</a></li>
-        <li><a href="#" target="{{ target_field }}" data="1000000" class="set_speed">1 Gbps</a></li>
-        <li><a href="#" target="{{ target_field }}" data="10000000" class="set_speed">10 Gbps</a></li>
-        <li><a href="#" target="{{ target_field }}" data="25000000" class="set_speed">25 Gbps</a></li>
-        <li><a href="#" target="{{ target_field }}" data="40000000" class="set_speed">40 Gbps</a></li>
-        <li><a href="#" target="{{ target_field }}" data="100000000" class="set_speed">100 Gbps</a></li>
-        <li class="divider"></li>
-        <li><a href="#" target="{{ target_field }}" data="1544" class="set_speed">T1 (1.544 Mbps)</a></li>
-        <li><a href="#" target="{{ target_field }}" data="2048" class="set_speed">E1 (2.048 Mbps)</a></li>
-    </ul>
-</span>