diff --git a/netbox/ipam/forms/models.py b/netbox/ipam/forms/models.py
index d69800aa5..afbe33282 100644
--- a/netbox/ipam/forms/models.py
+++ b/netbox/ipam/forms/models.py
@@ -529,7 +529,7 @@ class FHRPGroupForm(BootstrapMixin, CustomFieldModelForm):
         required=False
     )
 
-    # Optionally create a new IPAddress along with the NHRPGroup
+    # Optionally create a new IPAddress along with the FHRPGroup
     ip_vrf = DynamicModelChoiceField(
         queryset=VRF.objects.all(),
         required=False,
diff --git a/netbox/ipam/models/fhrp.py b/netbox/ipam/models/fhrp.py
index 42ab0b530..5a12a54bb 100644
--- a/netbox/ipam/models/fhrp.py
+++ b/netbox/ipam/models/fhrp.py
@@ -47,7 +47,7 @@ class FHRPGroup(PrimaryModel):
         to='ipam.IPAddress',
         content_type_field='assigned_object_type',
         object_id_field='assigned_object_id',
-        related_query_name='nhrp_group'
+        related_query_name='fhrp_group'
     )
 
     objects = RestrictedQuerySet.as_manager()
diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py
index f869a75c1..c9d126f45 100644
--- a/netbox/ipam/views.py
+++ b/netbox/ipam/views.py
@@ -981,16 +981,10 @@ class FHRPGroupAssignmentEditView(generic.ObjectEditView):
             instance.interface = get_object_or_404(content_type.model_class(), pk=request.GET.get('interface_id'))
         return instance
 
-    def get_return_url(self, request, obj=None):
-        return obj.interface.get_absolute_url() if obj else super().get_return_url(request)
-
 
 class FHRPGroupAssignmentDeleteView(generic.ObjectDeleteView):
     queryset = FHRPGroupAssignment.objects.all()
 
-    def get_return_url(self, request, obj=None):
-        return obj.interface.get_absolute_url() if obj else super().get_return_url(request)
-
 
 #
 # VLANs
diff --git a/netbox/templates/ipam/fhrpgroup.html b/netbox/templates/ipam/fhrpgroup.html
index 60d6a4bff..a7fa1a248 100644
--- a/netbox/templates/ipam/fhrpgroup.html
+++ b/netbox/templates/ipam/fhrpgroup.html
@@ -72,12 +72,13 @@
       <div class="card">
         <h5 class="card-header">Members</h5>
         <div class="card-body">
-          {% if ipaddress_table.rows %}
+          {% if members_table.rows %}
             {% render_table members_table 'inc/table.html' %}
           {% else %}
             <div class="text-muted">None</div>
           {% endif %}
         </div>
+      </div>
       {% plugin_full_width_page object %}
     </div>
   </div>
diff --git a/netbox/templates/ipam/inc/panels/fhrp_groups.html b/netbox/templates/ipam/inc/panels/fhrp_groups.html
index e5cb26104..9692927a3 100644
--- a/netbox/templates/ipam/inc/panels/fhrp_groups.html
+++ b/netbox/templates/ipam/inc/panels/fhrp_groups.html
@@ -1,7 +1,7 @@
 {% load helpers %}
 
 <div class="card">
-  <h5 class="card-header">NHRP Groups</h5>
+  <h5 class="card-header">FHRP Groups</h5>
   <div class="card-body">
     <table class="table table-hover table-headings">
       <thead>
@@ -10,6 +10,7 @@
           <th>Protocol</th>
           <th>Virtual IPs</th>
           <th>Priority</th>
+          <th></th>
         </tr>
       </thead>
       <tbody>
@@ -30,6 +31,18 @@
             <td>
               {{ assignment.priority }}
             </td>
+            <td class="text-end noprint">
+              {% if perms.ipam.change_fhrpgroupassignment %}
+                <a href="{% url 'ipam:fhrpgroupassignment_edit' pk=assignment.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-warning btn-sm lh-1" title="Edit">
+                  <i class="mdi mdi-pencil" aria-hidden="true"></i>
+                </a>
+              {% endif %}
+              {% if perms.ipam.delete_fhrpgroupassignment %}
+                <a href="{% url 'ipam:fhrpgroupassignment_delete' pk=assignment.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-danger btn-sm lh-1" title="Delete">
+                  <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i>
+                </a>
+              {% endif %}
+            </td>
           </tr>
         {% empty %}
           <tr>
@@ -46,7 +59,7 @@
       </a>
     {% endif %}
     {% if perms.ipam.add_fhrpgroupassignment %}
-      <a href="{% url 'ipam:fhrpgroupassignment_add' %}?interface_type={{ object|meta:"app_label" }}.{{ object|meta:"model_name" }}&interface_id={{ object.pk }}" class="btn btn-sm btn-primary">
+      <a href="{% url 'ipam:fhrpgroupassignment_add' %}?interface_type={{ object|meta:"app_label" }}.{{ object|meta:"model_name" }}&interface_id={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-primary">
         <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Assign Group
       </a>
     {% endif %}