diff --git a/netbox/templates/dcim/location.html b/netbox/templates/dcim/location.html
index 193d93f9a..b6cae1d2a 100644
--- a/netbox/templates/dcim/location.html
+++ b/netbox/templates/dcim/location.html
@@ -66,13 +66,13 @@
 	<div class="col col-md-6">
     {% include 'inc/panels/related_objects.html' %}
     {% include 'inc/panels/contacts.html' %}
-    {% include 'dcim/inc/nonracked_devices.html' %}
     {% include 'inc/panels/image_attachments.html' %}
     {% plugin_right_page object %}
 	</div>
 </div>
 <div class="row mb-3">
 	<div class="col col-md-12">
+    {% include 'dcim/inc/nonracked_devices.html' %}
     <div class="card">
       <h5 class="card-header">Child Locations</h5>
       <div class="card-body htmx-container table-responsive"
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html
index 9cb046b4e..9f57d3638 100644
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -190,13 +190,13 @@
             </div>
         </div>
         {% include 'inc/panels/related_objects.html' %}
-        {% include 'dcim/inc/nonracked_devices.html' %}
         {% include 'inc/panels/contacts.html' %}
         {% plugin_right_page object %}
     </div>
   </div>
   <div class="row">
       <div class="col col-md-12">
+          {% include 'dcim/inc/nonracked_devices.html' %}
           {% plugin_full_width_page object %}
       </div>
   </div>