diff --git a/atlas/templates/atlas/partials/case_list_item.html b/atlas/templates/atlas/partials/case_list_item.html
index 8dec3153..32aaae21 100644
--- a/atlas/templates/atlas/partials/case_list_item.html
+++ b/atlas/templates/atlas/partials/case_list_item.html
@@ -25,38 +25,44 @@
 
 
     <div class="btn-group btn-group-sm ms-2" role="group" aria-label="case-field-links">
-        {# History button: opens modal with history content #}
-        <a class="btn btn-outline-secondary" 
-           hx-get="{% url 'atlas:collection_case_field_partial' casedetail.collection.pk casedetail.case.pk 'history' %}"
-           hx-target=".modal-content" data-bs-toggle="modal" data-bs-target="#case-field-modal" title="View history">
-            {% if casedetail.case.history %}
+        <!-- History button: opens modal populated from hidden content on page -->
+        {% if casedetail.case.history %}
+            <a class="btn btn-outline-secondary" href="#"
+               onclick="document.querySelector('#case-field-modal .modal-content').innerHTML = document.getElementById('case-field-{{ casedetail.case.pk }}-history').innerHTML;"
+               data-bs-toggle="modal" data-bs-target="#case-field-modal" title="View history">
                 <i class="bi bi-clock-history text-primary"></i>
-            {% else %}
+            </a>
+        {% else %}
+            <a class="btn btn-outline-secondary disabled" aria-disabled="true" href="javascript:void(0);" title="No history">
                 <i class="bi bi-clock-history text-muted"></i>
-            {% endif %}
-        </a>
+            </a>
+        {% endif %}
 
-        {# Discussion button #}
-        <a class="btn btn-outline-secondary"
-           hx-get="{% url 'atlas:collection_case_field_partial' casedetail.collection.pk casedetail.case.pk 'discussion' %}"
-           hx-target=".modal-content" data-bs-toggle="modal" data-bs-target="#case-field-modal" title="View discussion">
-            {% if casedetail.case.discussion %}
+        <!-- Discussion button -->
+        {% if casedetail.case.discussion %}
+            <a class="btn btn-outline-secondary" href="#"
+               onclick="document.querySelector('#case-field-modal .modal-content').innerHTML = document.getElementById('case-field-{{ casedetail.case.pk }}-discussion').innerHTML;"
+               data-bs-toggle="modal" data-bs-target="#case-field-modal" title="View discussion">
                 <i class="bi bi-chat-left-text text-primary"></i>
-            {% else %}
+            </a>
+        {% else %}
+            <a class="btn btn-outline-secondary disabled" aria-disabled="true" href="javascript:void(0);" title="No discussion">
                 <i class="bi bi-chat-left-text text-muted"></i>
-            {% endif %}
-        </a>
+            </a>
+        {% endif %}
 
-        {# Report button #}
-        <a class="btn btn-outline-secondary"
-           hx-get="{% url 'atlas:collection_case_field_partial' casedetail.collection.pk casedetail.case.pk 'report' %}"
-           hx-target=".modal-content" data-bs-toggle="modal" data-bs-target="#case-field-modal" title="View report">
-            {% if casedetail.case.report %}
+        <!-- Report button -->
+        {% if casedetail.case.report %}
+            <a class="btn btn-outline-secondary" href="#"
+               onclick="document.querySelector('#case-field-modal .modal-content').innerHTML = document.getElementById('case-field-{{ casedetail.case.pk }}-report').innerHTML;"
+               data-bs-toggle="modal" data-bs-target="#case-field-modal" title="View report">
                 <i class="bi bi-file-earmark-text text-primary"></i>
-            {% else %}
+            </a>
+        {% else %}
+            <a class="btn btn-outline-secondary disabled" aria-disabled="true" href="javascript:void(0);" title="No report">
                 <i class="bi bi-file-earmark-text text-muted"></i>
-            {% endif %}
-        </a>
+            </a>
+        {% endif %}
     </div>
 
     </div>
@@ -65,4 +71,17 @@
         {% include 'atlas/partials/casedetails_management_links.html' %}
     </div>
 
+    {# Pre-render hidden modal content for this case to avoid HTMX calls #}
+    <div class="d-none">
+        <div id="case-field-{{ casedetail.case.pk }}-history">
+            {% include 'atlas/partials/case_field_modal.html' with field='history' content=casedetail.get_history_pre %}
+        </div>
+        <div id="case-field-{{ casedetail.case.pk }}-discussion">
+            {% include 'atlas/partials/case_field_modal.html' with field='discussion' content=casedetail.case.discussion %}
+        </div>
+        <div id="case-field-{{ casedetail.case.pk }}-report">
+            {% include 'atlas/partials/case_field_modal.html' with field='report' content=casedetail.case.report %}
+        </div>
+    </div>
+
 </li>
diff --git a/atlas/templates/atlas/partials/casedetails_management_links.html b/atlas/templates/atlas/partials/casedetails_management_links.html
index 8cce6586..013b1634 100644
--- a/atlas/templates/atlas/partials/casedetails_management_links.html
+++ b/atlas/templates/atlas/partials/casedetails_management_links.html
@@ -23,6 +23,9 @@
             </a>
         {% endif %}
     </div>
+
+    
+
     <div class="btn-group btn-group-sm" role="group" aria-label="status-indicator">
         {% if casedetail.default_viewerstate %}
             <button type="button" class="btn btn-sm btn-outline-success" aria-disabled="true" title="This case has a default viewerstate defined">
diff --git a/atlas/urls.py b/atlas/urls.py
index 8d670e67..dcc25810 100755
--- a/atlas/urls.py
+++ b/atlas/urls.py
@@ -228,11 +228,6 @@ urlpatterns = [
         name="collection_case_dicom_json_review",
     ),
     # Partial endpoint to return a single case field (history/discussion/report) for modal display
-    path(
-        "collection/<int:exam_id>/case/<int:case_number>/field/<str:field>",
-        views.collection_case_field_partial,
-        name="collection_case_field_partial",
-    ),
 
     path(
         "collection/<int:exam_id>/case/id/<int:case_id>/dicom_json/review",
diff --git a/atlas/views.py b/atlas/views.py
index abd7b549..02129413 100755
--- a/atlas/views.py
+++ b/atlas/views.py
@@ -4339,35 +4339,6 @@ def collection_case_dicom_json(request, exam_id, case_id, review=False):
     return JsonResponse(casedetail.case.get_case_dicom_json(priors=priors))
 
 
-def collection_case_field_partial(request, exam_id, case_number, field):
-    """Return a small HTML partial containing a single field (history/discussion/report)
-    for the given case in a collection. Supports case_number (index) or case_id (pk).
-    """
-    # Support either case_number (index) or case_id (case PK)
-    try:
-        casedetail = CaseDetail.objects.get(case=case_number, collection=exam_id)
-    except Exception:
-        collection = get_object_or_404(CaseCollection, pk=exam_id)
-        try:
-            case_obj = collection.get_case_by_index(int(case_number))
-            casedetail = CaseDetail.objects.get(case=case_obj, collection=collection)
-        except Exception:
-            raise Http404("Case not found in collection")
-
-    field = field.lower()
-    if field == "history":
-        # Use casedetail helper to respect redact/override/collection settings when appropriate
-        content = casedetail.get_history_pre() if hasattr(casedetail, "get_history_pre") else (casedetail.case.history or "")
-    elif field == "discussion":
-        content = casedetail.case.discussion or ""
-    elif field == "report":
-        content = casedetail.case.report or ""
-    else:
-        raise Http404("Unknown field")
-
-    return render(request, "atlas/partials/case_field_modal.html", {"casedetail": casedetail, "field": field, "content": content})
-
-
 def case_dicom_json(request, pk):
     case = get_object_or_404(Case, pk=pk)