diff --git a/app/coffee/modules/common/estimation.coffee b/app/coffee/modules/common/estimation.coffee
index b6ff0f5d..890a2fde 100644
--- a/app/coffee/modules/common/estimation.coffee
+++ b/app/coffee/modules/common/estimation.coffee
@@ -226,6 +226,10 @@ EstimationsService = ($template, $qqueue, $repo, $confirm, $q) ->
 
             @$el.find(".pop-points-open").show()
 
+            pop = @$el.find(".pop-points-open")
+            if pop.offset().top + pop.height() > document.body.clientHeight
+                pop.addClass('pop-bottom')
+
     create = ($el, us, project) ->
         $el.unbind("click")
 
diff --git a/app/styles/modules/backlog/backlog-table.scss b/app/styles/modules/backlog/backlog-table.scss
index 02d61896..00c47757 100644
--- a/app/styles/modules/backlog/backlog-table.scss
+++ b/app/styles/modules/backlog/backlog-table.scss
@@ -78,6 +78,9 @@
     }
     .pop-points-open {
         @include popover(200px, 0, 30px, '', '');
+        &.pop-bottom {
+            @include popover(200px, 'auto', 30px, 0, '');
+        }
         li {
             display: inline-block;
             width: 23%;