diff --git a/netbox/templates/inc/search_panel.html b/netbox/templates/inc/search_panel.html
index 4d76dff69..7f07a6136 100644
--- a/netbox/templates/inc/search_panel.html
+++ b/netbox/templates/inc/search_panel.html
@@ -5,37 +5,38 @@
         Search
     </h5>
     <div class="card-body">
-        <form action="." method="get" class="form">
+        <form action="." method="get">
             {% for field in filter_form.hidden_fields %}
                 {{ field }}
             {% endfor %}
             {% for field in filter_form.visible_fields %}
-                <div class="row mb-3">
-                <div class="col">
-                    {% if field.name == "q" %}
-                        <div class="input-group">
-                            <input type="text" name="q" class="form-control" placeholder="Search" {% if request.GET.q %}value="{{ request.GET.q }}" {% endif %}/>
-                            <button type="submit" class="btn btn-primary">
-                                <i class="bi bi-search"></i>
-                            </button>
-                        </div>
-                    {% elif field|widget_type == 'checkboxinput' %}
-                        <label for="{{ field.id_for_label }}">{{ field }} {{ field.label }}</label>
-                    {% else %}
-                        {{ field.label_tag }}
-                        {{ field }}
-                    {% endif %}
-                    </div>
+                {% if field.name == "q" %}
+                <div class="input-group mb-3">
+                    <input type="text" name="q" class="form-control" placeholder="Search" {% if request.GET.q %}value="{{ request.GET.q }}" {% endif %}/>
+                    <button type="submit" class="btn btn-primary">
+                        <i class="bi bi-search"></i>
+                    </button>
                 </div>
+                {% elif field|widget_type == 'checkboxinput' %}
+                <div class="form-check mb-3">
+                    <label class="form-check-label" for="{{ field.id_for_label }}">{{ field.label }}</label>
+                    {{ field }}
+                </div>
+                {% else %}
+                <div class="form-floating mb-3">
+                    {{ field }}
+                    {{ field.label_tag }}
+                </div>
+                {% endif %}
             {% endfor %}
-            <div class="card-footer text-end noprint px-0 border-0">
-                <button type="submit" class="btn btn-primary">
-                    <i class="bi bi-search"></i> Apply
-                </button>
-                <a href="." class="btn btn-outline-dark">
-                    <i class="bi bi-x"></i> Clear
-                </a>
-            </div>
         </form>
     </div>
+    <div class="card-footer text-end noprint border-0">
+        <a href="." class="btn btn-sm btn-outline-dark m-1">
+            <i class="bi bi-x"></i> Clear
+        </a>
+        <button type="submit" class="btn btn-sm btn-primary m-1">
+            <i class="bi bi-search"></i> Apply
+        </button>
+    </div>
 </div>