diff --git a/EventListener/CampaignSubscriber.php b/EventListener/CampaignSubscriber.php
index 01e437e79..79bd52813 100644
--- a/EventListener/CampaignSubscriber.php
+++ b/EventListener/CampaignSubscriber.php
@@ -91,7 +91,7 @@ public function onCampaignBuild(CampaignBuilderEvent $event): void
                 'description'     => $this->translator->trans('custom.item.events.field.value_descr', ['%customObject%' => $customObject->getNameSingular()]),
                 'eventName'       => CustomItemEvents::ON_CAMPAIGN_TRIGGER_CONDITION,
                 'formType'        => CampaignConditionFieldValueType::class,
-                'formTheme'       => '@MauticForm/FormTheme/FieldValueCondition/_campaignevent_form_field_value_widget.html.twig',
+                'formTheme'       => '@CustomObjects/FormTheme/FieldValueCondition/campaign_condition_field_value_widget.html.twig',
                 'formTypeOptions' => ['customObjectId' => $customObject->getId()],
             ]);
         }
diff --git a/Resources/views/CustomItem/form.html.twig b/Resources/views/CustomItem/form.html.twig
index c23ff9e88..106922042 100644
--- a/Resources/views/CustomItem/form.html.twig
+++ b/Resources/views/CustomItem/form.html.twig
@@ -36,8 +36,7 @@
                                     </h3>
                                 </div>
                                 <div class="panel-body">
-                                    {{ form_row(fields, 'child_custom_field_values', template) }}
-{#                                    {{ formRowIfExists(fields, 'child_custom_field_values', template) }}#}
+                                    {%- if form.child_custom_field_values is defined %}{{ form_row(form.child_custom_field_values) }}{% endif %}
                                 </div>
                             </div>
                         </div>
diff --git a/Resources/views/FormTheme/FieldValueCondition/campaign_condition_field_value_widget.html.twig b/Resources/views/FormTheme/FieldValueCondition/campaign_condition_field_value_widget.html.twig
index 35c606a32..fa3d0ed7d 100644
--- a/Resources/views/FormTheme/FieldValueCondition/campaign_condition_field_value_widget.html.twig
+++ b/Resources/views/FormTheme/FieldValueCondition/campaign_condition_field_value_widget.html.twig
@@ -1,15 +1,15 @@
-<?php declare(strict_types=1);
-
-?>
+{% block _campaignevent_properties_row %}
 <div class="row">
     <div class="col-xs-4">
-        {{ form_row(field) }}
+        {{ form_row(form.field) }}
     </div>
     <div class="col-xs-4">
-        {{ form_row(operator) }}
+        {{ form_row(form.operator) }}
     </div>
     <div class="col-xs-4">
-        {{ form_row(value) }}
+        {{ form_row(form.value) }}
     </div>
 </div>
+{{ form_widget(form.customObjectId) }}
 <script>CustomObjects.initCustomFieldConditions()</script>
+{% endblock %}