diff --git a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
index e55bdee9babc3c903e8e6b722e0b46022d1d0424..7e46ad32f0e97545fb4f461782112aab6e45c988 100644
--- a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
+++ b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
@@ -988,6 +988,7 @@ class EditDocumentController
                         $this->storeArray,
                         $this->storeUrl,
                         $this->firstEl,
+                        $this->returnUrl,
                     ];
                     $this->getBackendUser()->pushModuleData('FormEngine', [$this->docHandler, $this->storeUrlMd5]);
                     BackendUtility::setUpdateSignal('OpendocsController::updateNumber', count($this->docHandler));
diff --git a/typo3/sysext/opendocs/Classes/Backend/ToolbarItems/OpendocsToolbarItem.php b/typo3/sysext/opendocs/Classes/Backend/ToolbarItems/OpendocsToolbarItem.php
index 7a6113d62b2ad14b120645535ac12624c9a9b97c..8a0aa0cebf828240dcdc468ba17737aaa73ab34c 100644
--- a/typo3/sysext/opendocs/Classes/Backend/ToolbarItems/OpendocsToolbarItem.php
+++ b/typo3/sysext/opendocs/Classes/Backend/ToolbarItems/OpendocsToolbarItem.php
@@ -162,7 +162,7 @@ class OpendocsToolbarItem implements ToolbarItemInterface, RequestAwareToolbarIt
         $result['table'] = $table;
         $result['record'] = $record;
         $result['label'] = strip_tags(htmlspecialchars_decode($document[0]));
-        $uri = $this->uriBuilder->buildUriFromRoute('record_edit') . '&' . $document[2];
+        $uri = $this->uriBuilder->buildUriFromRoute('record_edit', ['returnUrl' => $document[4] ?? null]) . '&' . $document[2];
         $pid = (int)$document[3]['pid'];
 
         if ($document[3]['table'] === 'pages') {