diff --git a/app/coffee/modules/backlog/lightboxes.coffee b/app/coffee/modules/backlog/lightboxes.coffee
index 27544d95..47a27275 100644
--- a/app/coffee/modules/backlog/lightboxes.coffee
+++ b/app/coffee/modules/backlog/lightboxes.coffee
@@ -27,7 +27,7 @@ CreateEditUserstoryDirective = ($repo, $model) ->
             $scope.us = {"subject": "KAKA"}
             $el.removeClass("hidden")
 
-        $scope.$on "usform:change", (ctx, us) ->
+        $scope.$on "usform:edit", (ctx, us) ->
             $el.removeClass("hidden")
             $scope.us = us
 
diff --git a/app/coffee/modules/backlog/main.coffee b/app/coffee/modules/backlog/main.coffee
index 6ba3f686..a66313c2 100644
--- a/app/coffee/modules/backlog/main.coffee
+++ b/app/coffee/modules/backlog/main.coffee
@@ -90,6 +90,9 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin)
 
     ## Template actions
 
+    editUserStory: (us) ->
+        @rootscope.$broadcast("usform:edit", us)
+
     deleteUserStory: (us) ->
         title = "Delete User Story"
         subtitle = us.subject
diff --git a/app/partials/views/components/backlog-row.jade b/app/partials/views/components/backlog-row.jade
index 213d19e8..6584d786 100644
--- a/app/partials/views/components/backlog-row.jade
+++ b/app/partials/views/components/backlog-row.jade
@@ -4,7 +4,7 @@ div.row.us-item-row(ng-repeat="us in visibleUserstories track by us.id")
             input(type="checkbox", name="")
             a(href="") {{ us.subject }}
             span.us-settings
-                a.icon.icon-edit(href="", ng-click="ctrl.deleteUserStory(us)", title="Edit")
+                a.icon.icon-edit(href="", ng-click="ctrl.editUserStory(us)", title="Edit")
                 a.icon.icon-delete(href="", ng-click="ctrl.deleteUserStory(us)", title="Delete")
         div.user-story-tags
             span.tag Tag name
diff --git a/app/partials/views/modules/lightbox_add-new-us.jade b/app/partials/views/modules/lightbox_add-new-us.jade
index 199c1883..1912f53a 100644
--- a/app/partials/views/modules/lightbox_add-new-us.jade
+++ b/app/partials/views/modules/lightbox_add-new-us.jade
@@ -5,7 +5,7 @@ form
     fieldset
         input(type="text", ng-model="us.subject", tg-i18n="placeholder:common.subject")
     fieldset
-        select(ng-model="us.status", ng-options="s.name for s in statusList",
+        select(ng-model="us.status", ng-options="s.id as s.name for s in statusList",
                tg-i18n="placeholder:common.status")
     fieldset
         input(type="text", placeholder="Tags", tg-tags, ng-model="us.tags")