diff --git a/apps/workflows/__init__.py b/apps/workflows/__init__.py
index 7fbe25d8f3..555950daeb 100644
--- a/apps/workflows/__init__.py
+++ b/apps/workflows/__init__.py
@@ -12,8 +12,8 @@ from .permissions import (PERMISSION_WORKFLOW_SETUP_VIEW,
     PERMISSION_STATE_SETUP_DELETE, PERMISSION_TRANSITION_SETUP_VIEW,
     PERMISSION_TRANSITION_SETUP_CREATE, PERMISSION_TRANSITION_SETUP_EDIT,
     PERMISSION_TRANSITION_SETUP_DELETE)
-from .models import Workflow, State, Transition, WorkflowState
-
+from .models import (Workflow, State, Transition, WorkflowState,
+    WorkflowStateTransition)
 
 setup_workflow_list_link = Link(text=_(u'workflow list'), view='setup_workflow_list', sprite='chart_organisation', permissions=[PERMISSION_WORKFLOW_SETUP_VIEW])
 setup_workflow_create_link = Link(text=_(u'create new workflow'), view='setup_workflow_create', sprite='chart_organisation_add', permissions=[PERMISSION_WORKFLOW_SETUP_CREATE])
@@ -26,6 +26,7 @@ setup_workflow_states_remove_link = Link(text=_(u'remove workflow state'), view=
 
 setup_workflow_state_transitions_list_link = Link(text=_(u'workflow state transitions'), view='setup_workflow_state_transitions_list', args='workflow_state.pk', sprite='chart_line', permissions=[PERMISSION_WORKFLOW_SETUP_EDIT])
 setup_workflow_state_transition_add_link = Link(text=_(u'add workflow state transition'), view='setup_workflow_state_transition_add', args='workflow_state.pk', sprite='chart_line_add', permissions=[PERMISSION_WORKFLOW_SETUP_EDIT])
+setup_workflow_state_transition_edit_link = Link(text=_(u'edit workflow state transition'), view='setup_workflow_state_transition_edit', args='workflow_state_transition.pk', sprite='chart_line_edit', permissions=[PERMISSION_WORKFLOW_SETUP_EDIT])
 
 setup_state_list_link = Link(text=_(u'state list'), view='setup_state_list', sprite='transmit', permissions=[PERMISSION_STATE_SETUP_VIEW])
 setup_state_create_link = Link(text=_(u'create new state'), view='setup_state_create', sprite='transmit_add', permissions=[PERMISSION_STATE_SETUP_CREATE])
@@ -39,7 +40,7 @@ setup_transition_delete_link = Link(text=_(u'delete'), view='setup_transition_de
 
 bind_links(
     [
-        Workflow, State, Transition,
+        Workflow, State, Transition, WorkflowStateTransition,
         'setup_workflow_list', 'setup_workflow_create',
         'setup_state_list', 'setup_state_create',
         'setup_transition_list', 'setup_transition_create',
@@ -60,4 +61,6 @@ bind_links([Transition, 'setup_transition_list', 'setup_transition_create'], [se
 bind_links([WorkflowState], [setup_workflow_state_transitions_list_link, setup_workflow_states_edit_link, setup_workflow_states_remove_link])
 bind_links([WorkflowState], [setup_workflow_state_transition_add_link], menu_name=u'sidebar')
 
+bind_links([WorkflowStateTransition], [setup_workflow_state_transition_edit_link])#, setup_transition_delete_link])
+
 register_setup(Link(text=_(u'workflows'), view='setup_workflow_list', icon='chart_organisation.png', permissions=[PERMISSION_WORKFLOW_SETUP_VIEW]))
diff --git a/apps/workflows/models.py b/apps/workflows/models.py
index 5a755b010b..55a3958402 100644
--- a/apps/workflows/models.py
+++ b/apps/workflows/models.py
@@ -67,7 +67,6 @@ class WorkflowState(models.Model):
     description = models.TextField(blank=True, verbose_name=_(u'description'))
         
     def __unicode__(self):
-        #return '%s (%s)' % (self.label, self.workflow.label)
         return unicode(self.state)
 
     @property
@@ -75,6 +74,7 @@ class WorkflowState(models.Model):
         return self.workflowstatetransition_set
 
     class Meta:
+        #unique_together = ('workflow', 'state')
         verbose_name = _(u'workflow state')
         verbose_name_plural = _(u'workflows states')
 
diff --git a/apps/workflows/urls.py b/apps/workflows/urls.py
index eb85c41b7a..19a9dbcfd3 100644
--- a/apps/workflows/urls.py
+++ b/apps/workflows/urls.py
@@ -13,6 +13,7 @@ urlpatterns = patterns('workflows.views',
 
     url(r'^setup/workflow/state/(?P<workflow_state_pk>\d+)/transition/list/$', 'setup_workflow_state_transitions_list', (), 'setup_workflow_state_transitions_list'),
     url(r'^setup/workflow/state/(?P<workflow_state_pk>\d+)/transition/add/$', 'setup_workflow_state_transition_add', (), 'setup_workflow_state_transition_add'),
+    url(r'^setup/workflow/state/transition/(?P<workflow_state_transition_pk>\d+)/edit/$', 'setup_workflow_state_transition_edit', (), 'setup_workflow_state_transition_edit'),
 
     url(r'^setup/state/list/$', 'setup_state_list', (), 'setup_state_list'),
     url(r'^setup/state/create/$', 'setup_state_create', (), 'setup_state_create'),
diff --git a/apps/workflows/views.py b/apps/workflows/views.py
index dc483c8ece..1373cfd8bc 100644
--- a/apps/workflows/views.py
+++ b/apps/workflows/views.py
@@ -525,6 +525,9 @@ def setup_workflow_state_transitions_list(request, workflow_state_pk):
             {'object': 'workflow_state', 'name': _(u'state')},
         ],
         'list_object_variable_name': 'state_transition',
+        'extra_columns': [
+            {'name': _(u'Destination'), 'attribute': 'workflow_state_destination'},
+        ],
     }
 
     return render_to_response('generic_list.html', context,
@@ -556,33 +559,36 @@ def setup_workflow_state_transition_add(request, workflow_state_pk):
         ],
     }, context_instance=RequestContext(request))
 
-"""
-def setup_state_transition_edit(request, state_transition_pk):
+
+def setup_workflow_state_transition_edit(request, work_state_transition_pk):
     Permission.objects.check_permissions(request.user, [PERMISSION_WORKFLOW_SETUP_EDIT])
-    state_transition = get_object_or_404(WorkflowState, pk=state_transition_pk)
-    redirect_url = reverse('setup_state_transitions_list', args=[state_transition.state.pk])
+    workflow_state_transition = get_object_or_404(WorkflowStateTransition, pk=work_state_transition_pk)
+    redirect_url = reverse('setup_workflow_state_transitions_list', args=[workflow_state_transition.workflow_state_source.pk])
 
     if request.method == 'POST':
-        form = WorkflowStateSetupForm(state=state_transition.state, instance=state_transition, data=request.POST)
+        form = WorkflowStateTransitionSetupForm(workflow_state=workflow_state_transition.workflow_state_source, instance=workflow_state_transition, data=request.POST)
         if form.is_valid():
-            state = form.save()
-            messages.success(request, _(u'worflow state edited succesfully.'))
+            workflow_state_transition = form.save()
+            messages.success(request, _(u'worflow state transition edited succesfully.'))
             return HttpResponseRedirect(redirect_url)
     else:
-        form = WorkflowStateSetupForm(state=state_transition.state, instance=state_transition)
+        form = WorkflowStateSetupForm(workflow_state=workflow_state_transition.workflow_state_source, instance=workflow_state_transition)
 
     return render_to_response('generic_form.html', {
-        'title': _(u'edit worflow state'),
+        'title': _(u'edit worflow state transition: %s') % workflow_state_transition,
         'form': form,
-        'state': state_transition.state,
-        'state_transition': state_transition,
+        'workflow_state': workflow_state_transition.workflow_state_source,
+        'workflow': workflow_state_transition.workflow_state_source.workflow,
+        'workflow_state_transition': workflow_state_transition,
         'navigation_object_list': [
-            {'object': 'state', 'name': _(u'state')},
-            {'object': 'state_transition', 'name': _(u'state state')}
+            {'object': 'workflow', 'name': _(u'workflow')},
+            {'object': 'workflow_state', 'name': _(u'state')},
+            {'object': 'workflow_state_transition', 'name': _(u'transition')},
         ],
+        'list_object_variable_name': 'workflow_state_transition',
     }, context_instance=RequestContext(request))
     
-
+"""
 def setup_state_transition_remove(request, state_transition_pk=None, state_transition_pk_list=None):
     post_action_redirect = None