diff --git a/apis_bibsonomy/templates/apis_bibsonomy/partials/reference_list.html b/apis_bibsonomy/templates/apis_bibsonomy/partials/reference_list.html
index bb35905..3791f55 100644
--- a/apis_bibsonomy/templates/apis_bibsonomy/partials/reference_list.html
+++ b/apis_bibsonomy/templates/apis_bibsonomy/partials/reference_list.html
@@ -1,5 +1,4 @@
 <script src="https://unpkg.com/htmx.org@1.9.0"></script>
-<div id="referencelist">
 {% include "apis_bibsonomy/partials/fix_select2_bootstrap_overflow.html" %}
 <ul class="list-group list-group-flush">
 {% for reference in object_list %}
@@ -18,7 +17,11 @@
 
 {% if form %}
 {% load crispy_forms_tags %}
-<form method="post" hx-post="{{ request.path }}" hx-target="#referencelist" hx-swap="outerHTML" class="mt-4">
+<form method="post"
+  hx-post="{{ hxpost|default:request.path }}"
+  hx-target="{{ hxtarget|default:"#referencelist" }}"
+  hx-swap="innerHTML"
+  class="mt-4">
 {% crispy form %}
 </form>
 {% endif %}
@@ -31,4 +34,3 @@
 {% include "apis_bibsonomy/partials/reinit_select2.html" %}
 {% include "apis_bibsonomy/partials/fix_select2_bootstrap_focus.html" %}
 {% include "apis_bibsonomy/partials/autofill_bibsonomy.html" %}
-</div>
diff --git a/apis_bibsonomy/templates/apis_bibsonomy/reference_list.html b/apis_bibsonomy/templates/apis_bibsonomy/reference_list.html
index 4a0753f..fd0b4ed 100644
--- a/apis_bibsonomy/templates/apis_bibsonomy/reference_list.html
+++ b/apis_bibsonomy/templates/apis_bibsonomy/reference_list.html
@@ -3,8 +3,11 @@
 {% block content %}
 <div class="container">
 <div class="px-4 py-5 my-5 text-center">
-<h1>References:</h1>
+  <h1>References on {{ object }}:</h1>
+</div>
+<div id="referencelist">
+{% url "apis_bibsonomy:referenceonlistpartial" contenttype.id object.id as hxpost %}
+{% include "apis_bibsonomy/partials/reference_list.html" with hxpost=hxpost %}
 </div>
-{% include "apis_bibsonomy/partials/reference_list.html" %}
 </div>
 {% endblock content %}
diff --git a/apis_bibsonomy/templates/apis_bibsonomy/reference_list_modal.html b/apis_bibsonomy/templates/apis_bibsonomy/reference_list_modal.html
new file mode 100644
index 0000000..7911809
--- /dev/null
+++ b/apis_bibsonomy/templates/apis_bibsonomy/reference_list_modal.html
@@ -0,0 +1,12 @@
+<div class="modal-header">
+  <div class="modal-title" id="referenceModalLabel">References on: {{ object }}</div>
+  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+    <span aria-hidden="true">&times;</span>
+  </button>
+</div>
+<div class="modal-body">
+{% include "apis_bibsonomy/partials/reference_list.html" with hxtarget="#modal-here" %}
+</div>
+<div class="modal-footer">
+  <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+</div>
diff --git a/apis_bibsonomy/urls.py b/apis_bibsonomy/urls.py
index b602801..00ceaab 100644
--- a/apis_bibsonomy/urls.py
+++ b/apis_bibsonomy/urls.py
@@ -12,4 +12,6 @@
     path('references/<int:pk>', views.ReferenceDetailView.as_view(), name='referencedetail'),
     path('references/<int:pk>/delete', views.ReferenceDeleteView.as_view(), name='referencedelete'),
     path('referenceson/<int:contenttype>/<int:pk>', views.ReferenceOnListView.as_view(), name="referenceonlist"),
+    path('referenceson/<int:contenttype>/<int:pk>/modal', views.ReferenceOnListViewModal.as_view(), name="referenceonlistmodal"),
+    path('referenceson/<int:contenttype>/<int:pk>/partial', views.ReferenceOnListViewPartial.as_view(), name="referenceonlistpartial"),
 ]
diff --git a/apis_bibsonomy/views.py b/apis_bibsonomy/views.py
index 5b463da..0377d91 100644
--- a/apis_bibsonomy/views.py
+++ b/apis_bibsonomy/views.py
@@ -48,16 +48,10 @@ def get_queryset(self):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
+        context["contenttype"] = self.contenttype
         context["object"] = self.contenttype.get_object_for_this_type(id=self.pk)
         return context
 
-    def get_template_names(self):
-        # return only a partial if the request is ajax or htmx
-        partial = "HX-Request" in self.request.headers or self.request.headers.get('x-requested-with') == 'XMLHttpRequest'
-        if partial:
-            return "apis_bibsonomy/partials/reference_list.html"
-        return super().get_template_names()
-
     def get_success_url(self):
         return reverse('apis_bibsonomy:referenceonlist', kwargs=self.request.resolver_match.kwargs)
 
@@ -72,3 +66,17 @@ def form_valid(self, form):
         ref = Reference.objects.create(**args)
         self.request.session["last_bibsonomy_reference_title"] = ref.bibtexjson.get("title")
         return super().form_valid(form)
+
+
+class ReferenceOnListViewModal(ReferenceOnListView):
+    template_name = "apis_bibsonomy/reference_list_modal.html"
+
+    def get_success_url(self):
+        return reverse('apis_bibsonomy:referenceonlistmodal', kwargs=self.request.resolver_match.kwargs)
+
+
+class ReferenceOnListViewPartial(ReferenceOnListView):
+    template_name = "apis_bibsonomy/partials/reference_list.html"
+
+    def get_success_url(self):
+        return reverse('apis_bibsonomy:referenceonlistpartial', kwargs=self.request.resolver_match.kwargs)