diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css
index 597a96969..3880b0291 100644
Binary files a/netbox/project-static/dist/netbox-dark.css and b/netbox/project-static/dist/netbox-dark.css differ
diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css
index f3a42a28d..2dd22a612 100644
Binary files a/netbox/project-static/dist/netbox-light.css and b/netbox/project-static/dist/netbox-light.css differ
diff --git a/netbox/project-static/dist/netbox-print.css b/netbox/project-static/dist/netbox-print.css
index e9c2621b2..3d0bbb106 100644
Binary files a/netbox/project-static/dist/netbox-print.css and b/netbox/project-static/dist/netbox-print.css differ
diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss
index 2e1cd3482..0d4fd9b1e 100644
--- a/netbox/project-static/styles/netbox.scss
+++ b/netbox/project-static/styles/netbox.scss
@@ -288,7 +288,7 @@ div.title-container {
     justify-content: flex-start;
 
     // Right-align controls on larger screens.
-    @include media-breakpoint-up(md) {
+    @include media-breakpoint-up(lg) {
       justify-content: flex-end;
     }
 
@@ -872,11 +872,22 @@ div.card-overlay {
   }
 }
 
-div.card > div.card-header > div.table-controls {
+.table-controls {
   display: flex;
-  align-items: center;
-  width: 100%;
-  max-width: 25%;
+
+  @include media-breakpoint-up(md) {
+    // `!important` needed because of inherited margin-bottom from `.col`
+    margin-top: 0 !important;
+    margin-bottom: 0 !important;
+  }
+
+  .table-configure {
+    justify-content: flex-start;
+
+    @include media-breakpoint-up(md) {
+      justify-content: flex-end;
+    }
+  }
 
   .form-switch.form-check-inline {
     flex: 1 0 auto;
diff --git a/netbox/templates/inc/table_controls.html b/netbox/templates/inc/table_controls.html
index 871b15aac..a7a7ebfb5 100644
--- a/netbox/templates/inc/table_controls.html
+++ b/netbox/templates/inc/table_controls.html
@@ -1,5 +1,5 @@
 <div class="row mb-3 justify-content-between">
-  <div class="col col-12 col-lg-4 my-3 my-lg-0 d-flex noprint table-controls">
+  <div class="table-controls noprint col col-12 col-md-8 col-lg-4">
     <div class="input-group input-group-sm">
       <input
         type="text"
@@ -9,9 +9,9 @@
       />
     </div>
   </div>
-  <div class="col col-md-3 mb-0 d-flex noprint table-controls">
+  <div class="table-controls noprint col col-md-3 mb-0">
     {% if request.user.is_authenticated and table_modal %}
-      <div class="input-group input-group-sm justify-content-end">
+      <div class="table-configure input-group input-group-sm">
         <button
           type="button"
           data-bs-toggle="modal"