diff --git a/frontend/src/components/ConditionObjects.vue b/frontend/src/components/ConditionObjects.vue
index 9939b08..90b2f4f 100644
--- a/frontend/src/components/ConditionObjects.vue
+++ b/frontend/src/components/ConditionObjects.vue
@@ -19,7 +19,7 @@
 
         <q-tab-panels v-model="tab" animated>
           <q-tab-panel name="fields">
-              <field-list v-model="selected" type="single" :filter="filter" :appId="appId" :fields="sourceFields"></field-list>
+              <field-list v-model="selected" type="single" :filter="filter" :appId="sourceApp ? sourceApp :appId " :fields="sourceFields"></field-list>
             </q-tab-panel>
 
           <q-tab-panel name="vars" >
@@ -53,6 +53,7 @@ export default {
     
     return {
       sourceFields : inject('sourceFields'),
+      sourceApp : inject('sourceApp'),
       tab: ref('fields'),
       selected
     }
diff --git a/frontend/src/components/right/ConditionInput.vue b/frontend/src/components/right/ConditionInput.vue
index bc44fa4..966339a 100644
--- a/frontend/src/components/right/ConditionInput.vue
+++ b/frontend/src/components/right/ConditionInput.vue
@@ -69,13 +69,22 @@ export default defineComponent({
       type: String,
       default: null
     },
+    sourceType: {
+      type: String,
+      default: 'field'
+    }
   },
 
   setup(props, { emit }) {
     const source = props.context.find(element => element?.props?.name === 'sources')
     
     if (source) {
-      provide('sourceFields', computed( () => source.props?.modelValue?.fields ?? []));
+      if(props.sourceType === 'field'){
+        provide('sourceFields', computed( () => source.props?.modelValue?.fields ?? []));
+      } else if(props.sourceType === 'app'){
+        console.log('sourceApp', source.props?.modelValue);
+        provide('sourceApp', computed( () => source.props?.modelValue?.app?.id));
+      }
     }
 
     const appDg = ref();