diff --git a/app/coffee/modules/userstories/detail.coffee b/app/coffee/modules/userstories/detail.coffee
index e6059190..d807dffd 100644
--- a/app/coffee/modules/userstories/detail.coffee
+++ b/app/coffee/modules/userstories/detail.coffee
@@ -420,7 +420,7 @@ UsEstimationDirective = ($log) ->
             html = mainTemplate({totalPoints: totalPoints, roles: roles})
             $el.html(html)
 
-        renderPoints = (us, roleId) ->
+        renderPoints = (target, us, roleId) ->
             points = _.map $scope.project.points, (point) ->
                 point = _.clone(point, true)
                 point.selected = if us.points[roleId] == point.id then false else true
@@ -439,7 +439,7 @@ UsEstimationDirective = ($log) ->
             $el.find(".pop-points-open").remove()
 
             # Render into DOM and show the new created element
-            $el.find(".points-per-role").append(html)
+            $el.find(target).append(html)
 
             $el.find(".pop-points-open").popover().open(-> $(this).removeClass("active"))
             $el.find(".pop-points-open").show()
@@ -463,7 +463,7 @@ UsEstimationDirective = ($log) ->
             roleId = target.data("role-id")
 
             us = $scope.$eval($attrs.ngModel)
-            renderPoints(us, roleId)
+            renderPoints(target, us, roleId)
 
             target.siblings().removeClass('active')
             target.addClass('active')
diff --git a/app/styles/modules/common/lightbox.scss b/app/styles/modules/common/lightbox.scss
index 9a712975..a0ebad89 100644
--- a/app/styles/modules/common/lightbox.scss
+++ b/app/styles/modules/common/lightbox.scss
@@ -165,6 +165,12 @@
             display: none;
         }
     }
+    .points-per-role {
+        .popover {
+            @include popover(200px, $top: 105%, $left: 35%, $arrow-width: 10px, $arrow-top: -5px, $arrow-left: 10px);
+            color: orange;
+        }
+    }
 }
 
 .lightbox-generic-bulk {