diff --git a/src/argus/htmx/destination/views.py b/src/argus/htmx/destination/views.py
index be74a0344..53546c1ee 100644
--- a/src/argus/htmx/destination/views.py
+++ b/src/argus/htmx/destination/views.py
@@ -48,17 +48,10 @@ def delete_htmx(request, pk: int) -> HttpResponse:
 def update_htmx(request, pk: int) -> HttpResponse:
     destination = DestinationConfig.objects.get(pk=pk)
     form = DestinationFormUpdate(request.POST or None, instance=destination, request=request)
-    template = "htmx/destination/_form_list.html"
     if form.is_valid():
         form.save()
-        return _render_destination_list(request, template=template)
-
-    update_forms = _get_update_forms(request.user)
-    for index, update_form in enumerate(update_forms):
-        if update_form.instance.pk == pk:
-            update_forms[index] = form
-            break
-    return _render_destination_list(request, update_forms=update_forms, template=template)
+    context = {"form": form, "update_error_msg": None}
+    return render(request, "htmx/destination/_update_and_delete_form.html", context=context)
 
 
 def _render_destination_list(
diff --git a/src/argus/htmx/templates/htmx/destination/_edit_form.html b/src/argus/htmx/templates/htmx/destination/_edit_form.html
index ff02a31c5..bef9e6e4a 100644
--- a/src/argus/htmx/templates/htmx/destination/_edit_form.html
+++ b/src/argus/htmx/templates/htmx/destination/_edit_form.html
@@ -1,6 +1,7 @@
 <form hx-post="{% url 'htmx:htmx-update' form.instance.id %}"
       hx-trigger="submit"
-      hx-target="#form-list"
+      hx-target="closest #update-delete-forms"
+      hx-swap="outerHTML"
       class="flex flex-nowrap items-center gap-4">
   {% csrf_token %}
   <fieldset class="flex flex-nowrap items-center gap-4">