diff -r 49f68aeb1dd2 -r c0c7b4ca2946 src/main/webapp/WEB-INF/jsp/version-form.jsp
--- a/src/main/webapp/WEB-INF/jsp/version-form.jsp	Mon Sep 22 20:00:59 2025 +0200
+++ b/src/main/webapp/WEB-INF/jsp/version-form.jsp	Sat Oct 04 13:34:33 2025 +0200
@@ -31,6 +31,10 @@
 <jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.VersionEditView" scope="request" />
 <c:set var="version" scope="page" value="${viewmodel.version}"/>
 <c:set var="project" scope="page" value="${viewmodel.projectInfo.project}"/>
+<c:set scope="page" var="returnLink" value="${requestScope[Constants.REQ_ATTR_REFERER]}"/>
+<c:if test="${empty returnLink}">
+    <c:set scope="page" var="returnLink" value="./projects/${project.node}/versions/"/>
+</c:if>
 
 <form action="./projects/${project.node}/versions/-/commit" method="post">
     <table class="formtable" style="width: 35ch">
@@ -89,7 +93,8 @@
         <tr>
             <td colspan="2">
                 <input type="hidden" name="id" value="${version.id}"/>
-                <a href="./projects/${project.node}/versions/" class="button">
+                <input type="hidden" name="returnLink" value="${returnLink}"/>
+                <a href="${returnLink}" class="button">
                     <fmt:message key="button.cancel"/>
                 </a>
                 <button type="submit"><fmt:message key="button.okay"/></button>