diff --git a/django/project/inventory/templates/inventory/giveBack.html b/django/project/inventory/templates/inventory/giveBack.html
index 0f12c48..dbf5f8f 100644
--- a/django/project/inventory/templates/inventory/giveBack.html
+++ b/django/project/inventory/templates/inventory/giveBack.html
@@ -16,6 +16,11 @@
 <br />
 <form method="post">{% csrf_token %}
 	<input class="button" type="submit" value="{% trans 'Save' %}" />
-	<a href="{% url 'inventory:detailWorkplace' user.id %}" class="button button-cancel">{% trans 'Cancel' %}</a>
+	<a href="{% if placeType == "customer" %}
+    {% url 'inventory:detailCustomer' place.id %}
+{% else %}
+    {% url 'inventory:detailWorkplace' place.id %}
+{% endif %}" class="button button-cancel">{% trans 'Cancel' %}</a>
+
 </form>
 {% endblock %}
\ No newline at end of file
diff --git a/django/project/inventory/views.py b/django/project/inventory/views.py
index 4c34a1a..5c112be 100644
--- a/django/project/inventory/views.py
+++ b/django/project/inventory/views.py
@@ -309,4 +309,9 @@ def giveBack(request, handoverID):
             return HttpResponseRedirect('/inventory/detailCustomer/' + str(place.id))
         return HttpResponseRedirect('/inventory/detailWorkplace/' + str(place.id))
 
-    return render(request, 'inventory/giveBack.html', { 'place':place, 'thing':thing })
+    if oldHandover.user_content_type == ContentType.objects.get_for_model(Customer):
+        placeType = "customer"
+    else:
+        placeType = "workplace"
+
+    return render(request, 'inventory/giveBack.html', { 'place':place, 'thing':thing , 'placeType':placeType})