diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index 54bd5a84d..6ed07d536 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -7,6 +7,7 @@
 * [#5035](https://github.com/netbox-community/netbox/issues/5035) - Fix exception when modifying an IP address assigned to a VM
 * [#5038](https://github.com/netbox-community/netbox/issues/5038) - Fix validation of primary IPs assigned to virtual machines
 * [#5040](https://github.com/netbox-community/netbox/issues/5040) - Limit SLAAC status to IPv6 addresses
+* [#5041](https://github.com/netbox-community/netbox/issues/5041) - Fix form tabs when assigning an IP to a VM interface
 * [#5042](https://github.com/netbox-community/netbox/issues/5042) - Fix display of SLAAC label for IP addresses status
 
 ---
diff --git a/netbox/templates/ipam/inc/ipadress_edit_header.html b/netbox/templates/ipam/inc/ipadress_edit_header.html
index b8ec3878a..ed9692eea 100644
--- a/netbox/templates/ipam/inc/ipadress_edit_header.html
+++ b/netbox/templates/ipam/inc/ipadress_edit_header.html
@@ -4,7 +4,7 @@
     <li role="presentation"{% if active_tab == 'add' %} class="active"{% endif %}>
         <a href="{% url 'ipam:ipaddress_add' %}{% querystring request %}">New IP</a>
     </li>
-    {% if 'interface' in request.GET %}
+    {% if 'interface' in request.GET or 'vminterface' in request.GET %}
         <li role="presentation"{% if active_tab == 'assign' %} class="active"{% endif %}>
             <a href="{% url 'ipam:ipaddress_assign' %}{% querystring request %}">Assign IP</a>
         </li>