diff --git a/docs/release-notes/version-2.6.md b/docs/release-notes/version-2.6.md
index 04f0ce991..436698377 100644
--- a/docs/release-notes/version-2.6.md
+++ b/docs/release-notes/version-2.6.md
@@ -10,6 +10,7 @@
 
 * [#3669](https://github.com/netbox-community/netbox/issues/3669) - Include `weight` field in prefix/VLAN role form
 * [#3674](https://github.com/netbox-community/netbox/issues/3674) - Include comments on PowerFeed view
+* [#3679](https://github.com/netbox-community/netbox/issues/3679) - Fix link for assigned ipaddress in interface page
 
 # v2.6.7 (2019-11-01)
 
diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py
index 0dde11870..91f195ba0 100644
--- a/netbox/ipam/tables.py
+++ b/netbox/ipam/tables.py
@@ -85,7 +85,7 @@ IPADDRESS_LINK = """
 """
 
 IPADDRESS_ASSIGN_LINK = """
-<a href="{% url 'ipam:ipaddress_edit' pk=record.pk %}?interface={{ request.GET.interface }}&return_url={{ request.GET.return_url }}">{{ record }}</a>
+<a href="{% url 'ipam:ipaddress_edit' pk=record.pk %}?interface={{ record.interface.pk }}&return_url={{ request.path }}">{{ record }}</a>
 """
 
 IPADDRESS_PARENT = """