diff --git a/app/assets/javascripts/gantt.js b/app/assets/javascripts/gantt.js
index 08bf34631..4ff255678 100644
--- a/app/assets/javascripts/gantt.js
+++ b/app/assets/javascripts/gantt.js
@@ -123,8 +123,8 @@ function getProgressLinesArray() {
     } else {
       var issue_done = $("#task-done-" + $(element).attr("id"));
       var is_behind_start = $(element).children('span').hasClass('behind-start-date');
-      var is_over_end     = $(element).children('span').hasClass('over-end-date');
-      if (is_over_end) {
+      var is_ahead_start  = $(element).children('span').hasClass('ahead-start-date');
+      if (is_ahead_start) {
         arr.push({left: draw_right, top: element_top_upper, is_right_edge: true});
         arr.push({left: draw_right, top: element_top_lower, is_right_edge: true, none_stroke: true});
       } else if (issue_done.length > 0) {
diff --git a/lib/redmine/helpers/gantt.rb b/lib/redmine/helpers/gantt.rb
index c2fc285a7..c3e9f30b2 100644
--- a/lib/redmine/helpers/gantt.rb
+++ b/lib/redmine/helpers/gantt.rb
@@ -723,7 +723,7 @@ module Redmine
             progress_date = calc_progress_date(issue.start_date,
                                                issue.due_before, issue.done_ratio)
             css_classes << ' behind-start-date' if progress_date < self.date_from
-            css_classes << ' over-end-date' if progress_date > self.date_to
+            css_classes << ' ahead-start-date' if progress_date > self.date_to && issue.done_ratio > 0
           end
           s = (+"").html_safe
           s << view.sprite_icon('issue').html_safe
@@ -744,7 +744,7 @@ module Redmine
             progress_date = calc_progress_date(version.start_date,
                                                version.due_date, version.visible_fixed_issues.completed_percent)
             html_class << ' behind-start-date' if progress_date < self.date_from
-            html_class << ' over-end-date' if progress_date > self.date_to
+            html_class << ' ahead-start-date' if progress_date > self.date_to && version.visible_fixed_issues.completed_percent > 0
           end
           s = (+"").html_safe
           s << view.sprite_icon('package').html_safe