diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/nodes/condition.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/nodes/condition.tsx
index e5ac699a18..7d8158b68e 100644
--- a/packages/plugins/@nocobase/plugin-workflow/src/client/nodes/condition.tsx
+++ b/packages/plugins/@nocobase/plugin-workflow/src/client/nodes/condition.tsx
@@ -170,7 +170,13 @@ function Calculation({ calculator, operands = [], onChange }) {
         flex-wrap: wrap;
       `}
     >
-      <Variable.Input value={operands[0]} onChange={leftOperandOnChange} scope={leftOptions} useTypedConstant />
+      <Variable.Input
+        changeOnSelect
+        value={operands[0]}
+        onChange={leftOperandOnChange}
+        scope={leftOptions}
+        useTypedConstant
+      />
       <Select
         // @ts-ignore
         role="button"
@@ -193,7 +199,13 @@ function Calculation({ calculator, operands = [], onChange }) {
             </Select.OptGroup>
           ))}
       </Select>
-      <Variable.Input value={operands[1]} onChange={rightOperandOnChange} scope={rightOptions} useTypedConstant />
+      <Variable.Input
+        changeOnSelect
+        value={operands[1]}
+        onChange={rightOperandOnChange}
+        scope={rightOptions}
+        useTypedConstant
+      />
     </fieldset>
   );
 }
@@ -391,6 +403,9 @@ export default class extends Instruction {
       title: `{{t("Condition expression", { ns: "${NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',
       'x-component': 'WorkflowVariableTextArea',
+      'x-component-props': {
+        changeOnSelect: true,
+      },
       ['x-validator'](value, rules, { form }) {
         const { values } = form;
         const { evaluate } = evaluators.get(values.engine);