diff --git a/app/library/templates/library/work_list.html b/app/library/templates/library/work_list.html
index 854c32f..1c61060 100644
--- a/app/library/templates/library/work_list.html
+++ b/app/library/templates/library/work_list.html
@@ -2,8 +2,8 @@
 {% load url_tools %}
 
 {% block admin %}
-{% if collection_id %}
-<a href="{% url 'work_add' pk=collection_id %}" class="button is-link">
+{% if collection %}
+<a href="{% url 'work_add' collection.pk %}" class="button is-link">
     <span class="icon"><i class="fas fa-plus-circle"></i></span>
     <span>Add a work</span>
 </a>
diff --git a/app/library/views/__init__.py b/app/library/views/__init__.py
index e4fda93..6ae03be 100644
--- a/app/library/views/__init__.py
+++ b/app/library/views/__init__.py
@@ -205,7 +205,7 @@ class WorkAddView(CollectionMixin, FormView):
     def form_valid(self, form):
         work = form.save(commit=False)
         #work.ensemble_id = self.request.ensemble_id
-        work.collection_id = self.kwargs['pk']
+        work.collection_id = self.collection.pk
         work.save()
         
         # handle the files
@@ -217,7 +217,7 @@ class WorkAddView(CollectionMixin, FormView):
         if len(docs) == 1:
             return redirect('document_annotate', docs[0])
         else:
-            return redirect('work_detail', pk=work.pk)
+            return redirect('work_detail', collection=self.collection.pk, pk=work.pk)
 
 class WorkMixin(object):