diff --git a/typo3/sysext/tstemplate/Classes/Controller/ConstantEditorController.php b/typo3/sysext/tstemplate/Classes/Controller/ConstantEditorController.php
index e4c351a4ba12b578cb60a04e11902627f08386a7..8356b9ae60c389ebdac12f77630ee3177f3cf03d 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/ConstantEditorController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/ConstantEditorController.php
@@ -273,6 +273,7 @@ class ConstantEditorController extends AbstractTemplateModuleController
         $view->makeDocHeaderModuleMenu(['id' => $pageUid]);
         $view->assignMultiple([
             'pageUid' => $pageUid,
+            'moduleIdentifier' => $currentModuleIdentifier,
             'previousPage' => $this->getClosestAncestorPageWithTemplateRecord($pageUid),
         ]);
         return $view->renderResponse('ConstantEditorNoTemplate');
diff --git a/typo3/sysext/tstemplate/Classes/Controller/InfoModifyController.php b/typo3/sysext/tstemplate/Classes/Controller/InfoModifyController.php
index 7f1d3f361f47ccce82ce45b1bdb105f3594b83b4..5ee55faf39e064b39bff4dd2fc0afecb405a5eba 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/InfoModifyController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/InfoModifyController.php
@@ -79,6 +79,7 @@ class InfoModifyController extends AbstractTemplateModuleController
         $view->makeDocHeaderModuleMenu(['id' => $pageUid]);
         $view->assignMultiple([
             'pageUid' => $pageUid,
+            'moduleIdentifier' => $currentModuleIdentifier,
             'previousPage' => $this->getClosestAncestorPageWithTemplateRecord($pageUid),
         ]);
         return $view->renderResponse('InfoModifyNoTemplate');
diff --git a/typo3/sysext/tstemplate/Resources/Private/Partials/NoTemplate.html b/typo3/sysext/tstemplate/Resources/Private/Partials/NoTemplate.html
index a373b5e23ae18d296ab168b62a2f62d524d5922d..8dfc3bd656d453e4edeb7c922aece4122419e17a 100644
--- a/typo3/sysext/tstemplate/Resources/Private/Partials/NoTemplate.html
+++ b/typo3/sysext/tstemplate/Resources/Private/Partials/NoTemplate.html
@@ -42,7 +42,7 @@
                 <div class="card-text">
                     <p><f:translate key="LLL:EXT:tstemplate/Resources/Private/Language/locallang.xml:newWebsiteDescription" /></p>
                     <div>
-                        <form action="{f:be.uri(route: 'web_ts', parameters: '{id: pageUid}')}" method="post">
+                        <form action="{f:be.uri(route: moduleIdentifier, parameters: '{id: pageUid}')}" method="post">
                             <input type="hidden" name="action" value="createNewWebsiteTemplate" />
                             <input
                                 class="btn btn-primary"
diff --git a/typo3/sysext/tstemplate/Resources/Private/Templates/ConstantEditorNoTemplate.html b/typo3/sysext/tstemplate/Resources/Private/Templates/ConstantEditorNoTemplate.html
index 09617b1be71106cfbafceb03157ccf89eaeba455..a07d4753af4b3dd1598faca03b54d5181fed3925 100644
--- a/typo3/sysext/tstemplate/Resources/Private/Templates/ConstantEditorNoTemplate.html
+++ b/typo3/sysext/tstemplate/Resources/Private/Templates/ConstantEditorNoTemplate.html
@@ -13,7 +13,7 @@
             arguments="{
                 pageUid: pageUid,
                 previousPage: previousPage,
-                moduleIdentifier: 'web_typoscript_constanteditor'
+                moduleIdentifier: moduleIdentifier
             }"
         />
 
diff --git a/typo3/sysext/tstemplate/Resources/Private/Templates/InfoModifyNoTemplate.html b/typo3/sysext/tstemplate/Resources/Private/Templates/InfoModifyNoTemplate.html
index ce8c60644823377da8505877f260b9ccf6fd1dff..1da4080d96283e15e5fad1d67c0fd495cec52510 100644
--- a/typo3/sysext/tstemplate/Resources/Private/Templates/InfoModifyNoTemplate.html
+++ b/typo3/sysext/tstemplate/Resources/Private/Templates/InfoModifyNoTemplate.html
@@ -13,7 +13,7 @@
             arguments="{
                 pageUid: pageUid,
                 previousPage: previousPage,
-                moduleIdentifier: 'web_typoscript_infomodify'
+                moduleIdentifier: moduleIdentifier
             }"
         />