diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md
index ecccb7306..c03a4687f 100644
--- a/docs/release-notes/version-3.0.md
+++ b/docs/release-notes/version-3.0.md
@@ -22,6 +22,7 @@
 * [#7096](https://github.com/netbox-community/netbox/issues/7096) - Home links should honor `BASE_PATH` configuration
 * [#7101](https://github.com/netbox-community/netbox/issues/7101) - Enforce `MAX_PAGE_SIZE` for table and REST API pagination
 * [#7106](https://github.com/netbox-community/netbox/issues/7106) - Fix incorrect "Map It" button URL on a site's Physical Address field
+* [#7107](https://github.com/netbox-community/netbox/issues/7107) - Fix missing search button and search results in IP Address assignment "Assign IP" tab
 
 ---
 
diff --git a/netbox/templates/ipam/ipaddress_assign.html b/netbox/templates/ipam/ipaddress_assign.html
index 912056b9a..9a052d966 100644
--- a/netbox/templates/ipam/ipaddress_assign.html
+++ b/netbox/templates/ipam/ipaddress_assign.html
@@ -9,7 +9,7 @@
   {% include 'ipam/inc/ipadress_edit_header.html' with active_tab='assign' %}
 {% endblock %}
 
-{% block content %}
+{% block form %}
     <form action="{% querystring request %}" method="post" class="form form-horizontal">
         {% csrf_token %}
         {% for field in form.hidden_fields %}
@@ -17,13 +17,10 @@
         {% endfor %}
         <div class="row mb-3">
             <div class="col col-md-8 offset-md-2">
-                {% include 'ipam/inc/ipadress_edit_header.html' with active_tab='assign' %}
-                <div class="card">
-                    <h5 class="card-header">Select IP Address</h5>
-                    <div class="card-body">
-                        {% render_field form.vrf_id %}
-                        {% render_field form.q %}
-                    </div>
+                <div class="field-group">
+                    <h6>Select IP Address</h6>
+                    {% render_field form.vrf_id %}
+                    {% render_field form.q %}
                 </div>
             </div>
         </div>
@@ -42,4 +39,7 @@
             </div>
         </div>
     {% endif %}
-{% endblock %}
+{% endblock form %}
+
+{% block buttons %}
+{% endblock buttons%}