diff --git a/src/Form/ComponentFormBase.php b/src/Form/ComponentFormBase.php
index ff463f2be926a9642bef33e32d15112a3b35c108..f8e607974a2f14538ad1ab02932e1af603412854 100644
--- a/src/Form/ComponentFormBase.php
+++ b/src/Form/ComponentFormBase.php
@@ -373,7 +373,7 @@ abstract class ComponentFormBase extends FormBase implements ComponentFormInterf
    *   The form element.
    */
   public function afterBuild(array $element, FormStateInterface $form_state) {
-    $parents = array_merge($element['#parents'], [$this->getFormId()]);
+    $parents = array_merge($element['#parents'], [$this->getFormId(), $element['#paragraph']->bundle()]);
     $unprocessed_id = 'edit-' . implode('-', $parents);
     $element['#attributes']['data-drupal-selector'] = Html::getId($unprocessed_id);
     $element['#dialog_id'] = $unprocessed_id . '-dialog';