diff --git a/packages/core/botpress/src/web/views/FlowBuilder/nodeProps/ConditionModalForm.jsx b/packages/core/botpress/src/web/views/FlowBuilder/nodeProps/ConditionModalForm.jsx
index cde992a0210..eceb3f30da2 100644
--- a/packages/core/botpress/src/web/views/FlowBuilder/nodeProps/ConditionModalForm.jsx
+++ b/packages/core/botpress/src/web/views/FlowBuilder/nodeProps/ConditionModalForm.jsx
@@ -171,8 +171,9 @@ export default class ConditionModalForm extends Component {
   }
 
   getNodeOptions() {
-    const flow = this.props.currentFlow
-    return (flow && flow.nodes.map(({ name }) => ({ label: name, value: name }))) || []
+    const { currentFlow: flow, currentNodeName } = this.props
+    const nodes = (flow && flow.nodes) || []
+    return nodes.filter(({ name }) => name !== currentNodeName).map(({ name }) => ({ label: name, value: name }))
   }
 
   renderNodesChoice() {
diff --git a/packages/core/botpress/src/web/views/FlowBuilder/nodeProps/StandardNode.jsx b/packages/core/botpress/src/web/views/FlowBuilder/nodeProps/StandardNode.jsx
index 9d217afb40c..feb54cf859d 100644
--- a/packages/core/botpress/src/web/views/FlowBuilder/nodeProps/StandardNode.jsx
+++ b/packages/core/botpress/src/web/views/FlowBuilder/nodeProps/StandardNode.jsx
@@ -92,6 +92,8 @@ export default class StandardNodePropertiesPanel extends Component {
               readOnly={readOnly}
               items={node.next}
               header="Transitions"
+              currentFlow={this.props.flow}
+              currentNodeName={node.name}
               subflows={this.props.subflows}
               onItemsUpdated={items => this.props.updateNode({ next: items })}
               copyItem={item => this.props.copyFlowNodeElement({ transition: item })}
diff --git a/packages/core/botpress/src/web/views/FlowBuilder/nodeProps/TransitionSection.jsx b/packages/core/botpress/src/web/views/FlowBuilder/nodeProps/TransitionSection.jsx
index 35d561101ed..adcbd59c8a1 100644
--- a/packages/core/botpress/src/web/views/FlowBuilder/nodeProps/TransitionSection.jsx
+++ b/packages/core/botpress/src/web/views/FlowBuilder/nodeProps/TransitionSection.jsx
@@ -112,6 +112,7 @@ export default class TransitionSection extends Component {
         {!readOnly && (
           <ConditionModalForm
             currentFlow={this.props.currentFlow}
+            currentNodeName={this.props.currentNodeName}
             subflows={this.props.subflows}
             show={this.state.showConditionalModalForm}
             onClose={() => this.setState({ showConditionalModalForm: false, itemToEditIndex: null })}