diff --git a/plugins/ktcore/admin/workflowsv2.php b/plugins/ktcore/admin/workflowsv2.php
index 7fde02e..544c75e 100644
--- a/plugins/ktcore/admin/workflowsv2.php
+++ b/plugins/ktcore/admin/workflowsv2.php
@@ -893,6 +893,8 @@ class KTWorkflowAdminV2 extends KTAdminDispatcher {
             'context' => $this,
         ));
         $other_states = sprintf('id != %d', $this->oState->getId());
+        $other_states .= sprintf(' AND workflow_id = %d', $this->oWorkflow->getId());
+       
         $oForm->setWidgets(array(
             array('ktcore.widgets.entityselection', array(
                 'vocab' => KTWorkflowState::getList($other_states),