diff --git a/netbox/templates/base/layout.html b/netbox/templates/base/layout.html
index 1959ef38d..cf3841dd2 100644
--- a/netbox/templates/base/layout.html
+++ b/netbox/templates/base/layout.html
@@ -103,6 +103,9 @@
           </div>
         {% endif %}
 
+        {# BS5 pop-up modals #}
+        {% block modals %}{% endblock %}
+
         {# Page footer #}
         <footer class="footer container-fluid">
           <div class="row align-items-center justify-content-between mx-0">
diff --git a/netbox/templates/dcim/device/consoleports.html b/netbox/templates/dcim/device/consoleports.html
index b5a8a0f39..65c6651da 100644
--- a/netbox/templates/dcim/device/consoleports.html
+++ b/netbox/templates/dcim/device/consoleports.html
@@ -42,5 +42,8 @@
         {% endif %}
     </div>
   </form>
-  {% table_config_form table %}
 {% endblock %}
+
+{% block modals %}
+  {% table_config_form table %}
+{% endblock modals %}
diff --git a/netbox/templates/dcim/device/consoleserverports.html b/netbox/templates/dcim/device/consoleserverports.html
index e4e044288..7c56eceac 100644
--- a/netbox/templates/dcim/device/consoleserverports.html
+++ b/netbox/templates/dcim/device/consoleserverports.html
@@ -42,5 +42,8 @@
         {% endif %}
     </div>
   </form>
-  {% table_config_form table %}
 {% endblock %}
+
+{% block modals %}
+  {% table_config_form table %}
+{% endblock modals %}
diff --git a/netbox/templates/dcim/device/devicebays.html b/netbox/templates/dcim/device/devicebays.html
index 6ab387513..5c46ce3dc 100644
--- a/netbox/templates/dcim/device/devicebays.html
+++ b/netbox/templates/dcim/device/devicebays.html
@@ -39,5 +39,8 @@
         {% endif %}
     </div>
   </form>
-  {% table_config_form table %}
 {% endblock %}
+
+{% block modals %}
+  {% table_config_form table %}
+{% endblock modals %}
diff --git a/netbox/templates/dcim/device/frontports.html b/netbox/templates/dcim/device/frontports.html
index 2caa4d86c..814eed25a 100644
--- a/netbox/templates/dcim/device/frontports.html
+++ b/netbox/templates/dcim/device/frontports.html
@@ -42,5 +42,8 @@
         {% endif %}
     </div>
   </form>
-  {% table_config_form table %}
 {% endblock %}
+
+{% block modals %}
+  {% table_config_form table %}
+{% endblock modals %}
diff --git a/netbox/templates/dcim/device/interfaces.html b/netbox/templates/dcim/device/interfaces.html
index a862573ad..7141191dc 100644
--- a/netbox/templates/dcim/device/interfaces.html
+++ b/netbox/templates/dcim/device/interfaces.html
@@ -77,5 +77,8 @@
         {% endif %}
     </div>
   </form>
-  {% table_config_form table %}
 {% endblock %}
+
+{% block modals %}
+  {% table_config_form table %}
+{% endblock modals %}
diff --git a/netbox/templates/dcim/device/inventory.html b/netbox/templates/dcim/device/inventory.html
index 345884bf9..04c2ebea4 100644
--- a/netbox/templates/dcim/device/inventory.html
+++ b/netbox/templates/dcim/device/inventory.html
@@ -39,5 +39,8 @@
         {% endif %}
     </div>
   </form>
-  {% table_config_form table %}
 {% endblock %}
+
+{% block modals %}
+  {% table_config_form table %}
+{% endblock modals %}
diff --git a/netbox/templates/dcim/device/poweroutlets.html b/netbox/templates/dcim/device/poweroutlets.html
index 7b945438c..a4517c2e2 100644
--- a/netbox/templates/dcim/device/poweroutlets.html
+++ b/netbox/templates/dcim/device/poweroutlets.html
@@ -42,5 +42,8 @@
         {% endif %}
     </div>
   </form>
-  {% table_config_form table %}
 {% endblock %}
+
+{% block modals %}
+  {% table_config_form table %}
+{% endblock modals %}
diff --git a/netbox/templates/dcim/device/powerports.html b/netbox/templates/dcim/device/powerports.html
index 6f1ce2040..f1ea82382 100644
--- a/netbox/templates/dcim/device/powerports.html
+++ b/netbox/templates/dcim/device/powerports.html
@@ -42,5 +42,8 @@
         {% endif %}
     </div>
   </form>
-  {% table_config_form table %}
 {% endblock %}
+
+{% block modals %}
+  {% table_config_form table %}
+{% endblock modals %}
diff --git a/netbox/templates/dcim/device/rearports.html b/netbox/templates/dcim/device/rearports.html
index 12d5929c3..4a4198c03 100644
--- a/netbox/templates/dcim/device/rearports.html
+++ b/netbox/templates/dcim/device/rearports.html
@@ -42,5 +42,8 @@
         {% endif %}
     </div>
   </form>
-  {% table_config_form table %}
 {% endblock %}
+
+{% block modals %}
+  {% table_config_form table %}
+{% endblock modals %}
diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html
index 1de818ef6..eab544e30 100644
--- a/netbox/templates/generic/object_list.html
+++ b/netbox/templates/generic/object_list.html
@@ -133,6 +133,8 @@
     {% endif %}
   </div>
 
-  {# Table config form #}
-  {% table_config_form table table_name="ObjectTable" %}
 {% endblock content-wrapper %}
+
+{% block modals %}
+  {% table_config_form table table_name="ObjectTable" %}
+{% endblock modals %}
diff --git a/netbox/templates/ipam/aggregate/prefixes.html b/netbox/templates/ipam/aggregate/prefixes.html
index 3f805fc2e..4d9b6d105 100644
--- a/netbox/templates/ipam/aggregate/prefixes.html
+++ b/netbox/templates/ipam/aggregate/prefixes.html
@@ -37,5 +37,8 @@
       </div>
     </div>
   </form>
-  {% table_config_form table %}
 {% endblock %}
+
+{% block modals %}
+  {% table_config_form table %}
+{% endblock modals %}
diff --git a/netbox/templates/ipam/iprange/ip_addresses.html b/netbox/templates/ipam/iprange/ip_addresses.html
index 210cff812..8663c158f 100644
--- a/netbox/templates/ipam/iprange/ip_addresses.html
+++ b/netbox/templates/ipam/iprange/ip_addresses.html
@@ -35,5 +35,8 @@
       </div>
     </div>
   </form>
-  {% table_config_form table %}
 {% endblock %}
+
+{% block modals %}
+  {% table_config_form table %}
+{% endblock modals %}
diff --git a/netbox/templates/ipam/prefix/ip_addresses.html b/netbox/templates/ipam/prefix/ip_addresses.html
index e2f77756c..ae5d3cf74 100644
--- a/netbox/templates/ipam/prefix/ip_addresses.html
+++ b/netbox/templates/ipam/prefix/ip_addresses.html
@@ -35,5 +35,8 @@
       </div>
     </div>
   </form>
-  {% table_config_form table %}
 {% endblock %}
+
+{% block modals %}
+  {% table_config_form table %}
+{% endblock modals %}
diff --git a/netbox/templates/ipam/prefix/ip_ranges.html b/netbox/templates/ipam/prefix/ip_ranges.html
index af80578a0..3d5e0c4c0 100644
--- a/netbox/templates/ipam/prefix/ip_ranges.html
+++ b/netbox/templates/ipam/prefix/ip_ranges.html
@@ -35,5 +35,8 @@
       </div>
     </div>
   </form>
-  {% table_config_form table %}
 {% endblock %}
+
+{% block modals %}
+  {% table_config_form table %}
+{% endblock modals %}
diff --git a/netbox/templates/ipam/prefix/prefixes.html b/netbox/templates/ipam/prefix/prefixes.html
index 18fcbb569..21756a36a 100644
--- a/netbox/templates/ipam/prefix/prefixes.html
+++ b/netbox/templates/ipam/prefix/prefixes.html
@@ -37,5 +37,8 @@
       </div>
     </div>
   </form>
-  {% table_config_form table %}
 {% endblock %}
+
+{% block modals %}
+  {% table_config_form table %}
+{% endblock modals %}
diff --git a/netbox/templates/ipam/vlan/interfaces.html b/netbox/templates/ipam/vlan/interfaces.html
index acba983aa..3ce00631f 100644
--- a/netbox/templates/ipam/vlan/interfaces.html
+++ b/netbox/templates/ipam/vlan/interfaces.html
@@ -5,13 +5,14 @@
   <form method="post">
     {% csrf_token %}
     {% include 'inc/table_controls_htmx.html' with table_modal="VLANDevicesTable_config" %}
-
     <div class="card">
       <div class="card-body" id="object_list">
         {% include 'htmx/table.html' %}
       </div>
     </div>
-
   </form>
+{% endblock content %}
+
+{% block modals %}
   {% table_config_form table %}
-{% endblock %}
+{% endblock modals %}
diff --git a/netbox/templates/ipam/vlan/vminterfaces.html b/netbox/templates/ipam/vlan/vminterfaces.html
index aff559393..fcd207894 100644
--- a/netbox/templates/ipam/vlan/vminterfaces.html
+++ b/netbox/templates/ipam/vlan/vminterfaces.html
@@ -5,13 +5,14 @@
   <form method="post">
     {% csrf_token %}
     {% include 'inc/table_controls_htmx.html' with table_modal="VLANVirtualMachinesTable_config" %}
-
     <div class="card">
       <div class="card-body" id="object_list">
         {% include 'htmx/table.html' %}
       </div>
     </div>
-
   </form>
+{% endblock content %}
+
+{% block modals %}
   {% table_config_form table %}
-{% endblock %}
+{% endblock modals %}
diff --git a/netbox/templates/virtualization/cluster/devices.html b/netbox/templates/virtualization/cluster/devices.html
index ab774a29c..700006196 100644
--- a/netbox/templates/virtualization/cluster/devices.html
+++ b/netbox/templates/virtualization/cluster/devices.html
@@ -6,13 +6,11 @@
   <form action="{% url 'virtualization:cluster_remove_devices' pk=object.pk %}" method="post">
     {% csrf_token %}
     {% include 'inc/table_controls_htmx.html' with table_modal="DeviceTable_config" %}
-
     <div class="card">
       <div class="card-body" id="object_list">
         {% include 'htmx/table.html' %}
       </div>
     </div>
-
     <div class="noprint bulk-buttons">
       <div class="bulk-button-group">
         {% if perms.virtualization.change_cluster %}
@@ -23,5 +21,8 @@
       </div>
     </div>
   </form>
+{% endblock content %}
+
+{% block modals %}
   {% table_config_form table %}
-{% endblock %}
+{% endblock modals %}
diff --git a/netbox/templates/virtualization/cluster/virtual_machines.html b/netbox/templates/virtualization/cluster/virtual_machines.html
index 7681e3413..5b0359e07 100644
--- a/netbox/templates/virtualization/cluster/virtual_machines.html
+++ b/netbox/templates/virtualization/cluster/virtual_machines.html
@@ -6,13 +6,11 @@
   <form method="post">
     {% csrf_token %}
     {% include 'inc/table_controls_htmx.html' with table_modal="VirtualMachineTable_config" %}
-
     <div class="card">
       <div class="card-body" id="object_list">
         {% include 'htmx/table.html' %}
       </div>
     </div>
-
     <div class="noprint bulk-buttons">
       <div class="bulk-button-group">
         {% if perms.virtualization.change_virtualmachine %}
@@ -28,5 +26,8 @@
       </div>
     </div>
   </form>
+{% endblock content %}
+
+{% block modals %}
   {% table_config_form table %}
-{% endblock %}
+{% endblock modals %}
diff --git a/netbox/templates/virtualization/virtualmachine/interfaces.html b/netbox/templates/virtualization/virtualmachine/interfaces.html
index 6b3e70c7f..5f6ab52ad 100644
--- a/netbox/templates/virtualization/virtualmachine/interfaces.html
+++ b/netbox/templates/virtualization/virtualmachine/interfaces.html
@@ -37,5 +37,8 @@
         <div class="clearfix"></div>
      </div>
   </form>
+{% endblock content %}
+
+{% block modals %}
   {% table_config_form table %}
-{% endblock %}
+{% endblock modals %}