diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index d3ea3acd7..320e52680 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -3183,7 +3183,7 @@ class CableView(generic.ObjectView):
 class CableEditView(generic.ObjectEditView):
     queryset = Cable.objects.all()
     template_name = 'dcim/cable_edit.html'
-    htmx_template_name = 'dcim/cable_edit.html'
+    htmx_template_name = 'dcim/htmx/cable_edit.html'
 
     def dispatch(self, request, *args, **kwargs):
 
@@ -3214,8 +3214,6 @@ class CableEditView(generic.ObjectEditView):
                 CABLE_TERMINATION_TYPES.get(b_terminations_type)
             )
 
-            self.skip_htmx = True
-
             self.form = forms.get_cable_form(a_type, b_type)
 
         return super().alter_object(obj, request, url_args, url_kwargs)
diff --git a/netbox/netbox/views/generic/object_views.py b/netbox/netbox/views/generic/object_views.py
index e352f5f2a..21d740b8e 100644
--- a/netbox/netbox/views/generic/object_views.py
+++ b/netbox/netbox/views/generic/object_views.py
@@ -167,7 +167,7 @@ class ObjectEditView(GetReturnURLMixin, BaseObjectView):
     """
     template_name = 'generic/object_edit.html'
     form = None
-    skip_htmx = False
+    htmx_template_name = 'htmx/form.html'
 
     def dispatch(self, request, *args, **kwargs):
         # Determine required permission based on whether we are editing an existing object
@@ -228,8 +228,8 @@ class ObjectEditView(GetReturnURLMixin, BaseObjectView):
         restrict_form_fields(form, request.user)
 
         # If this is an HTMX request, return only the rendered form HTML
-        if is_htmx(request) and not self.skip_htmx:
-            return render(request, 'htmx/form.html', {
+        if is_htmx(request):
+            return render(request, self.htmx_template_name, {
                 'form': form,
             })
 
diff --git a/netbox/templates/dcim/cable_edit.html b/netbox/templates/dcim/cable_edit.html
index c27ca2992..fbe877d87 100644
--- a/netbox/templates/dcim/cable_edit.html
+++ b/netbox/templates/dcim/cable_edit.html
@@ -1,113 +1,5 @@
 {% extends 'generic/object_edit.html' %}
-{% load static %}
-{% load helpers %}
-{% load form_helpers %}
-{% load i18n %}
 
 {% block form %}
-  {# A side termination #}
-  <div id="a_termination_block" class="field-group mb-5">
-    <div class="row mb-2">
-      <h5 class="offset-sm-3">{% trans "A Side" %}</h5>
-    </div>
-    {% if 'termination_a_device' in form.fields %}
-      {% render_field form.termination_a_device %}
-    {% endif %}
-    {% if 'termination_a_powerpanel' in form.fields %}
-      {% render_field form.termination_a_powerpanel %}
-    {% endif %}
-    {% if 'termination_a_circuit' in form.fields %}
-      {% render_field form.termination_a_circuit %}
-    {% endif %}
-    {% if 'a_terminations' in form.fields %}
-      {% render_field form.a_terminations %}
-    {% else %}
-      <div class="row mb-3">
-        <label class="col-sm-3 col-form-label text-lg-end">{% trans "Termination Type" %}</label>
-        <div class="col" hx-select="#a_termination_block" hx-target="#a_termination_block">
-          <button class="btn btn-primary" hx-get="?a_terminations_type=dcim.interface">{% trans "Interface" %}</button>
-          <button class="btn btn-primary" hx-get="?a_terminations_type=dcim.frontport">{% trans "Front Port" %}</button>
-          <button class="btn btn-primary" hx-get="?a_terminations_type=dcim.rearport">{% trans "Rear Port" %}</button>
-          <button class="btn btn-primary" hx-get="?a_terminations_type=circuits.circuittermination">{% trans "Circuit Termination" %}</button>
-        </div>
-      </div>
-    {% endif %}
-  </div>
-
-  {# B side termination #}
-  <div id="b_termination_block" class="field-group mb-5">
-    <div class="row mb-2">
-      <h5 class="offset-sm-3">{% trans "B Side" %}</h5>
-    </div>
-    {% if 'termination_b_device' in form.fields %}
-      {% render_field form.termination_b_device %}
-    {% endif %}
-    {% if 'termination_b_powerpanel' in form.fields %}
-      {% render_field form.termination_b_powerpanel %}
-    {% endif %}
-    {% if 'termination_b_circuit' in form.fields %}
-      {% render_field form.termination_b_circuit %}
-    {% endif %}
-    {% if 'b_terminations' in form.fields %}
-        {% render_field form.b_terminations %}
-    {% else %}
-      <div class="row mb-3">
-        <label class="col-sm-3 col-form-label text-lg-end">{% trans "Termination Type" %}</label>
-        <div class="col" hx-select="#b_termination_block" hx-target="#b_termination_block">
-          <button class="btn btn-primary" hx-get="?b_terminations_type=dcim.interface">{% trans "Interface" %}</button>
-          <button class="btn btn-primary" hx-get="?b_terminations_type=dcim.frontport">{% trans "Front Port" %}</button>
-          <button class="btn btn-primary" hx-get="?b_terminations_type=dcim.rearport">{% trans "Rear Port" %}</button>
-          <button class="btn btn-primary" hx-get="?b_terminations_type=circuits.circuittermination">{% trans "Circuit Termination" %}</button>
-        </div>
-      </div>
-    {% endif %}
-  </div>
-
-  {# Cable attributes #}
-  <div class="field-group mb-5">
-    <div class="row mb-2">
-      <h5 class="offset-sm-3">{% trans "Cable" %}</h5>
-    </div>
-    {% render_field form.status %}
-    {% render_field form.type %}
-    {% render_field form.label %}
-    {% render_field form.description %}
-    {% render_field form.color %}
-    <div class="row mb-3">
-      <label class="col-sm-3 col-form-label text-lg-end">{{ form.length.label }}</label>
-      <div class="col-md-5">
-        {{ form.length }}
-      </div>
-      <div class="col-md-4">
-        {{ form.length_unit }}
-      </div>
-      <div class="invalid-feedback"></div>
-    </div>
-    {% render_field form.tags %}
-  </div>
-
-  <div class="field-group mb-5">
-    <div class="row mb-2">
-      <h5 class="offset-sm-3">{% trans "Tenancy" %}</h5>
-    </div>
-    {% render_field form.tenant_group %}
-    {% render_field form.tenant %}
-  </div>
-
-  {% if form.custom_fields %}
-    <div class="field-group mb-5">
-      <div class="row mb-2">
-        <h5 class="offset-sm-3">{% trans "Custom Fields" %}</h5>
-      </div>
-      {% render_custom_fields form %}
-    </div>
-  {% endif %}
-
-  {% if form.comments %}
-    <div class="field-group mb-5">
-      <h5 class="text-center">{% trans "Comments" %}</h5>
-      {% render_field form.comments %}
-    </div>
-  {% endif %}
-
+  {%  include 'dcim/htmx/cable_edit.html' %}
 {% endblock %}
diff --git a/netbox/templates/dcim/htmx/cable_edit.html b/netbox/templates/dcim/htmx/cable_edit.html
new file mode 100644
index 000000000..6fcbd71e4
--- /dev/null
+++ b/netbox/templates/dcim/htmx/cable_edit.html
@@ -0,0 +1,116 @@
+{% load static %}
+{% load helpers %}
+{% load form_helpers %}
+{% load i18n %}
+
+
+{# A side termination #}
+<div id="a_termination_block" class="field-group mb-5">
+  <div class="row mb-2">
+    <h5 class="offset-sm-3">{% trans "A Side" %}</h5>
+  </div>
+  {% if 'termination_a_device' in form.fields %}
+    {% render_field form.termination_a_device %}
+  {% endif %}
+  {% if 'termination_a_powerpanel' in form.fields %}
+    {% render_field form.termination_a_powerpanel %}
+  {% endif %}
+  {% if 'termination_a_circuit' in form.fields %}
+    {% render_field form.termination_a_circuit %}
+  {% endif %}
+  {% if 'a_terminations' in form.fields %}
+    {% render_field form.a_terminations %}
+  {% else %}
+    <div class="row mb-3">
+      <label for="a_termination_type" class="col-sm-3 col-form-label text-lg-end">{% trans "Termination Type" %}</label>
+      <div class="col" hx-select="#a_termination_block" hx-target="#a_termination_block" hx-trigger="changed">
+        <select class="netbox-static-select" hx-get name="a_terminations_type">
+            <option selected>----</option>
+            <option value="dcim.interface">{% trans "Interface" %}</option>
+            <option value="dcim.frontport">{% trans "Front Port" %}</option>
+            <option value="dcim.rearport">{% trans "Rear Port" %}</option>
+            <option value="circuits.circuittermination">{% trans "Circuit Termination" %}</option>
+        </select>
+      </div>
+    </div>
+  {% endif %}
+</div>
+
+{# B side termination #}
+<div id="b_termination_block" class="field-group mb-5">
+  <div class="row mb-2">
+    <h5 class="offset-sm-3">{% trans "B Side" %}</h5>
+  </div>
+  {% if 'termination_b_device' in form.fields %}
+    {% render_field form.termination_b_device %}
+  {% endif %}
+  {% if 'termination_b_powerpanel' in form.fields %}
+    {% render_field form.termination_b_powerpanel %}
+  {% endif %}
+  {% if 'termination_b_circuit' in form.fields %}
+    {% render_field form.termination_b_circuit %}
+  {% endif %}
+  {% if 'b_terminations' in form.fields %}
+      {% render_field form.b_terminations %}
+  {% else %}
+    <div class="row mb-3">
+      <label for="b_termination_type" class="col-sm-3 col-form-label text-lg-end">{% trans "Termination Type" %}</label>
+      <div class="col" hx-select="#b_termination_block" hx-target="#b_termination_block" hx-trigger="changed">
+        <select class="netbox-static-select" hx-get name="b_terminations_type">
+            <option selected>----</option>
+            <option value="dcim.interface">{% trans "Interface" %}</option>
+            <option value="dcim.frontport">{% trans "Front Port" %}</option>
+            <option value="dcim.rearport">{% trans "Rear Port" %}</option>
+            <option value="circuits.circuittermination">{% trans "Circuit Termination" %}</option>
+        </select>
+      </div>
+    </div>
+  {% endif %}
+</div>
+
+{# Cable attributes #}
+<div class="field-group mb-5">
+  <div class="row mb-2">
+    <h5 class="offset-sm-3">{% trans "Cable" %}</h5>
+  </div>
+  {% render_field form.status %}
+  {% render_field form.type %}
+  {% render_field form.label %}
+  {% render_field form.description %}
+  {% render_field form.color %}
+  <div class="row mb-3">
+    <label class="col-sm-3 col-form-label text-lg-end">{{ form.length.label }}</label>
+    <div class="col-md-5">
+      {{ form.length }}
+    </div>
+    <div class="col-md-4">
+      {{ form.length_unit }}
+    </div>
+    <div class="invalid-feedback"></div>
+  </div>
+  {% render_field form.tags %}
+</div>
+
+<div class="field-group mb-5">
+  <div class="row mb-2">
+    <h5 class="offset-sm-3">{% trans "Tenancy" %}</h5>
+  </div>
+  {% render_field form.tenant_group %}
+  {% render_field form.tenant %}
+</div>
+
+{% if form.custom_fields %}
+  <div class="field-group mb-5">
+    <div class="row mb-2">
+      <h5 class="offset-sm-3">{% trans "Custom Fields" %}</h5>
+    </div>
+    {% render_custom_fields form %}
+  </div>
+{% endif %}
+
+{% if form.comments %}
+  <div class="field-group mb-5">
+    <h5 class="text-center">{% trans "Comments" %}</h5>
+    {% render_field form.comments %}
+  </div>
+{% endif %}
\ No newline at end of file