diff --git a/core/modules/content_moderation/src/Form/ContentModerationConfigureForm.php b/core/modules/content_moderation/src/Form/ContentModerationConfigureForm.php
index 5698cdb..4e62b1f 100644
--- a/core/modules/content_moderation/src/Form/ContentModerationConfigureForm.php
+++ b/core/modules/content_moderation/src/Form/ContentModerationConfigureForm.php
@@ -15,6 +15,8 @@
 
 /**
  * The content moderation WorkflowType configuration form.
+ *
+ * @see \Drupal\content_moderation\Plugin\WorkflowType\ContentModeration
  */
 class ContentModerationConfigureForm extends WorkflowTypeConfigureFormBase implements ContainerInjectionInterface {
 
diff --git a/core/modules/content_moderation/src/Form/ContentModerationStateForm.php b/core/modules/content_moderation/src/Form/ContentModerationStateForm.php
index 558c9e9..b1a7baa 100644
--- a/core/modules/content_moderation/src/Form/ContentModerationStateForm.php
+++ b/core/modules/content_moderation/src/Form/ContentModerationStateForm.php
@@ -8,6 +8,8 @@
 
 /**
  * The content moderation state form.
+ *
+ * @see \Drupal\content_moderation\Plugin\WorkflowType\ContentModeration
  */
 class ContentModerationStateForm extends WorkflowTypeStateFormBase {
 
diff --git a/core/modules/workflows/src/Form/WorkflowTransitionAddForm.php b/core/modules/workflows/src/Form/WorkflowTransitionAddForm.php
index e9c7c07..e197737 100644
--- a/core/modules/workflows/src/Form/WorkflowTransitionAddForm.php
+++ b/core/modules/workflows/src/Form/WorkflowTransitionAddForm.php
@@ -182,7 +182,7 @@ public function save(array $form, FormStateInterface $form_state) {
       $subform_state = SubformState::createForSubform($form['type_settings'], $form, $form_state);
       $this->pluginFormFactory
         ->createInstance($workflow_type, 'transition')
-        ->submitConfigurationForm($form['type_settings'], $subform_state);
+        ->submitConfigurationForm($form['type_settings'], $subform_state, $workflow_type->getTransition($form_state->getValue('id')));
     }
 
     $workflow->save();
diff --git a/core/modules/workflows/tests/src/Functional/WorkflowUiTest.php b/core/modules/workflows/tests/src/Functional/WorkflowUiTest.php
index 7db8780..9a7f3cb 100644
--- a/core/modules/workflows/tests/src/Functional/WorkflowUiTest.php
+++ b/core/modules/workflows/tests/src/Functional/WorkflowUiTest.php
@@ -309,12 +309,12 @@ public function testWorkflowDecoration() {
     // Add additional state information when editing.
     $this->drupalGet('admin/config/workflow/workflows/manage/test/state/published');
     $this->assertSession()->pageTextContains('Extra information added to state');
-    $this->submitForm(['type_settings[workflow_type_complex_test][extra]' => 'Extra state information'], 'Save');
+    $this->submitForm(['type_settings[extra]' => 'Extra state information'], 'Save');
 
     // Add additional transition information when editing.
     $this->drupalGet('admin/config/workflow/workflows/manage/test/transition/publish');
     $this->assertSession()->pageTextContains('Extra information added to transition');
-    $this->submitForm(['type_settings[workflow_type_complex_test][extra]' => 'Extra transition information'], 'Save');
+    $this->submitForm(['type_settings[extra]' => 'Extra transition information'], 'Save');
 
     $workflow_storage = $this->container->get('entity_type.manager')->getStorage('workflow');
     /** @var \Drupal\workflows\WorkflowInterface $workflow */
@@ -325,12 +325,12 @@ public function testWorkflowDecoration() {
     // Add additional state information when adding.
     $this->drupalGet('admin/config/workflow/workflows/manage/test/add_state');
     $this->assertSession()->pageTextContains('Extra information added to state');
-    $this->submitForm(['label' => 'Draft', 'id' => 'draft', 'type_settings[workflow_type_complex_test][extra]' => 'Extra state information on add'], 'Save');
+    $this->submitForm(['label' => 'Draft', 'id' => 'draft', 'type_settings[extra]' => 'Extra state information on add'], 'Save');
 
     // Add additional transition information when adding.
     $this->drupalGet('admin/config/workflow/workflows/manage/test/add_transition');
     $this->assertSession()->pageTextContains('Extra information added to transition');
-    $this->submitForm(['id' => 'draft_published', 'label' => 'Publish', 'from[draft]' => 'draft', 'to' => 'published', 'type_settings[workflow_type_complex_test][extra]' => 'Extra transition information on add'], 'Save');
+    $this->submitForm(['id' => 'draft_published', 'label' => 'Publish', 'from[draft]' => 'draft', 'to' => 'published', 'type_settings[extra]' => 'Extra transition information on add'], 'Save');
 
     $workflow = $workflow_storage->loadUnchanged('test');
     $this->assertEquals('Extra state information on add', $workflow->getState('draft')->getExtra());