diff --git a/core/static/bundled/base-bundle-index.ts b/core/static/bundled/base-bundle-index.ts
index 8556a99e..eae4ce75 100644
--- a/core/static/bundled/base-bundle-index.ts
+++ b/core/static/bundled/base-bundle-index.ts
@@ -18,6 +18,7 @@ import { polyfillCountryFlagEmojis } from "country-flag-emoji-polyfill";
 import { limitedChoices } from "#core:alpine/limited-choices";
 import { expireOldStorage } from "#core:core/localstorage";
 import { default as navbar } from "#core:core/navbar";
+import { getErrorCallbacksExt } from "#core:htmx/error-callback";
 import {
   type NotificationPlugin,
   notificationsPlugin as notifications,
@@ -62,6 +63,9 @@ document.body.addEventListener(
   },
 );
 
+const errorCallbackExt = getErrorCallbacksExt();
+htmx.registerExtension(errorCallbackExt.name, errorCallbackExt.extension);
+
 Object.assign(window, { htmx });
 
 /**
diff --git a/core/static/bundled/htmx/error-callback.ts b/core/static/bundled/htmx/error-callback.ts
new file mode 100644
index 00000000..276181d4
--- /dev/null
+++ b/core/static/bundled/htmx/error-callback.ts
@@ -0,0 +1,74 @@
+interface CustomHtmxExtension {
+  name: string;
+  extension: any;
+}
+
+export const getErrorCallbacksExt = () => {
+  const attrPrefix = "hx-callback-";
+  let htmxApi: { attributeValue: (arg0: HTMLElement, arg1: string) => string | null };
+
+  const getCallback = (elt: HTMLElement, responseCode: number) => {
+    if (!elt || !responseCode) {
+      return () => {};
+    }
+
+    const code = responseCode.toString();
+
+    // '*' is the original syntax, as the obvious character for a wildcard.
+    // The 'x' alternative was added for maximum compatibility with HTML
+    // templating engines, due to ambiguity around which characters are
+    // supported in HTML attributes.
+    //
+    // Start with the most specific possible attribute and generalize from
+    // there.
+    const suffixes = [
+      code,
+
+      `${code.substring(0, 2)}*`,
+      `${code.substring(0, 2)}x`,
+
+      `${code.substring(0, 1)}*`,
+      `${code.substring(0, 1)}x`,
+      `${code.substring(0, 1)}**`,
+      `${code.substring(0, 1)}xx`,
+
+      "*",
+      "x",
+      "***",
+      "xxx",
+    ];
+    if (code.startsWith("4") || code.startsWith("5")) {
+      suffixes.push("error");
+    }
+
+    for (const suffix of suffixes) {
+      const attr = attrPrefix + suffix;
+      const callback = htmxApi?.attributeValue(elt, attr);
+      if (callback) {
+        return Function("src", "target", callback);
+      }
+    }
+
+    return () => {};
+  };
+
+  return {
+    name: "error-callbacks",
+    extension: {
+      init: (api: any) => {
+        htmxApi = api;
+      },
+      // biome-ignore lint/style/useNamingConvention: HTMX naming convention
+      htmx_response_error: (
+        elt: HTMLElement,
+        event: { ctx: any; cancelled: boolean },
+      ) => {
+        if (event.cancelled) {
+          return false;
+        }
+        getCallback(elt, event.ctx.response.status)(elt, event.ctx.target);
+        return true;
+      },
+    },
+  } as CustomHtmxExtension;
+};
diff --git a/pedagogy/static/pedagogy/css/pedagogy.scss b/pedagogy/static/pedagogy/css/pedagogy.scss
index 178b7962..a177ee4e 100644
--- a/pedagogy/static/pedagogy/css/pedagogy.scss
+++ b/pedagogy/static/pedagogy/css/pedagogy.scss
@@ -168,12 +168,6 @@ $pedagogy-white-text: #f0f0f0;
       .input-stars {
         margin-top: 20px;
       }
-
-      .right {
-        display: flex;
-        justify-content: flex-end;
-      }
-
     }
 
     .ue-details-container {
@@ -446,4 +440,9 @@ details.accordion>.accordion-content {
   background-color: $white-color;
   border-color: $pedagogy-orange;
   border-right: none;
+}
+
+.right {
+  display: flex;
+  justify-content: flex-end;
 }
\ No newline at end of file
diff --git a/pedagogy/templates/pedagogy/fragments/comment_report.jinja b/pedagogy/templates/pedagogy/fragments/comment_report.jinja
new file mode 100644
index 00000000..d729f545
--- /dev/null
+++ b/pedagogy/templates/pedagogy/fragments/comment_report.jinja
@@ -0,0 +1,30 @@
+<form
+  hx-post="{{ request.get_full_path() }}"
+  hx-ext="error-callbacks"
+  hx-target="this"
+  hx-swap="outerHTML"
+  hx-disabled-elt="input[type='submit']"
+  hx-trigger="submit"
+  hx-callback-404="target.remove()"
+>
+  {% csrf_token %}
+  {{ form.non_field_errors() }}
+  {{ form.reason.errors }}
+  {{ form.reason }}
+
+  {# Hidden fields #}
+  {{ form.reporter }}
+  {{ form.comment }}
+
+  <button
+    hx-get="{{ url('pedagogy:comment_detail', comment_id=comment_id) }}"
+    hx-target="closest form"
+    hx-swap="outerHTML"
+  >
+    {% trans %}Cancel{% endtrans %}
+  </button>
+
+  <p class="right" id="nique">
+    <input type="submit" value="{% trans %}Report{% endtrans %}" />
+  </p>
+</form>
\ No newline at end of file
diff --git a/pedagogy/templates/pedagogy/fragments/ue_comment.jinja b/pedagogy/templates/pedagogy/fragments/ue_comment.jinja
index 6361e8d9..3a4e5cd6 100644
--- a/pedagogy/templates/pedagogy/fragments/ue_comment.jinja
+++ b/pedagogy/templates/pedagogy/fragments/ue_comment.jinja
@@ -47,10 +47,12 @@
     {% endif %}
     {% if comment.author_id == user.id or user.has_perm("pedagogy.delete_comment") %}
       <form class="action"
+            hx-ext="error-callbacks"
             hx-post="{{ url('pedagogy:comment_delete', comment_id=comment.id) }}"
             hx-confirm='{% trans obj=object %}Are you sure you want to delete "{{ obj }}"?{% endtrans %}'
             hx-swap="outerHTML"
             hx-target="#comment-{{ comment.id }}"
+            hx-callback-404="document.getElementsByTagName('body')[0].dispatchEvent(new CustomEvent('CommentUpdate'));target.remove()"
       >
         {% csrf_token %}
         <button class="btn btn-red action">
@@ -63,7 +65,11 @@
   <div class="comment-end-bar">
     <div class="report">
       <p>
-        <a href="{{ url('pedagogy:comment_report', comment_id=comment.id) }}">
+        <a
+          hx-get="{{ url('pedagogy:comment_report', comment_id=comment.id) }}"
+          hx-swap="outerHTML"
+          hx-target="#comment-{{ comment.id }}"
+        >
           {% trans %}Report this comment{% endtrans %}
         </a>
       </p>
diff --git a/pedagogy/templates/pedagogy/macros.jinja b/pedagogy/templates/pedagogy/macros.jinja
index ffad4d1d..9f332655 100644
--- a/pedagogy/templates/pedagogy/macros.jinja
+++ b/pedagogy/templates/pedagogy/macros.jinja
@@ -13,4 +13,4 @@
     <span class="grade-text"> {% trans %} not rated {% endtrans %} </span>
   {% endif %}
 
-{%- endmacro %}
\ No newline at end of file
+{%- endmacro %}
diff --git a/pedagogy/views.py b/pedagogy/views.py
index 1d9f06f3..0d1350b6 100644
--- a/pedagogy/views.py
+++ b/pedagogy/views.py
@@ -140,7 +140,9 @@ class UECommentDetailView(PermissionRequiredMixin, DetailView):
     context_object_name = "comment"
 
     def get_queryset(self):
-        return super().get_queryset().annotate_is_reported()
+        return (
+            super().get_queryset().viewable_by(self.request.user).annotate_is_reported()
+        )
 
     def dispatch(self, *args, **kwargs):
         res: HttpResponse = super().dispatch(*args, **kwargs)
@@ -148,7 +150,9 @@ class UECommentDetailView(PermissionRequiredMixin, DetailView):
         return res
 
     def get_context_data(self, **kwargs):
-        return super().get_context_data(**kwargs) | {"ue": self.object.ue}
+        return super().get_context_data(**kwargs) | {
+            "ue": getattr(self.object, "ue", None)
+        }
 
 
 class UECommentUpdateView(PermissionOrAuthorRequiredMixin, AllowFragment, UpdateView):
@@ -189,11 +193,13 @@ class UECommentDeleteView(PermissionOrAuthorRequiredMixin, AllowFragment, Delete
     author_field = "author"
 
     def form_valid(self, form):
-        self.object.delete()
-        response = HttpResponse(status=200)
+        response = super().form_valid(form)
         response.headers["HX-Trigger"] = "CommentUpdate"
         return response
 
+    def get_success_url(self):
+        return reverse("pedagogy:comment_detail", kwargs={"comment_id": self.object.id})
+
 
 class UEGuideView(PermissionRequiredMixin, TemplateView):
     """UE guide main page."""
@@ -202,12 +208,12 @@ class UEGuideView(PermissionRequiredMixin, TemplateView):
     permission_required = "pedagogy.view_ue"
 
 
-class UECommentReportCreateView(PermissionRequiredMixin, CreateView):
+class UECommentReportCreateView(PermissionRequiredMixin, AllowFragment, CreateView):
     """Create a new report for an inappropriate comment."""
 
     model = UECommentReport
     form_class = UECommentReportForm
-    template_name = "core/edit.jinja"
+    template_name = "pedagogy/fragments/comment_report.jinja"
     permission_required = "pedagogy.add_uecommentreport"
 
     def dispatch(self, request, *args, **kwargs):
@@ -220,6 +226,11 @@ class UECommentReportCreateView(PermissionRequiredMixin, CreateView):
         kwargs["comment_id"] = self.ue_comment.id
         return kwargs
 
+    def get_context_data(self, **kwargs):
+        return super().get_context_data() | {
+            "comment_id": self.ue_comment.id,
+        }
+
     def form_valid(self, form):
         resp = super().form_valid(form)
         # Send a message to moderation admins
@@ -235,11 +246,12 @@ class UECommentReportCreateView(PermissionRequiredMixin, CreateView):
                 url=reverse("pedagogy:moderation"),
                 type="PEDAGOGY_MODERATION",
             )
-
         return resp
 
     def get_success_url(self):
-        return reverse("pedagogy:ue_detail", kwargs={"ue_id": self.ue_comment.ue_id})
+        return reverse(
+            "pedagogy:comment_detail", kwargs={"comment_id": self.ue_comment.id}
+        )
 
 
 class UEModerationFormView(PermissionRequiredMixin, FormView):