diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/DatesMapperOnInterval.java b/ganttzk/src/main/java/org/zkoss/ganttz/DatesMapperOnInterval.java
index 7dda488ee..b34d59c28 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/DatesMapperOnInterval.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/DatesMapperOnInterval.java
@@ -73,4 +73,9 @@ public class DatesMapperOnInterval implements IDatesMapper {
         return millisecondsPerPixel;
     }
 
+    @Override
+    public int getHorizontalSize() {
+        return this.horizontalSize;
+    }
+
 }
\ No newline at end of file
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/IDatesMapper.java b/ganttzk/src/main/java/org/zkoss/ganttz/IDatesMapper.java
index 3ad132c8b..0dc679522 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/IDatesMapper.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/IDatesMapper.java
@@ -38,4 +38,6 @@ public interface IDatesMapper {
 
     long getMilisecondsPerPixel();
 
+    int getHorizontalSize();
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java
index a08279f86..f51e1cb6c 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java
@@ -249,9 +249,18 @@ public class QueueComponent extends XulElement implements
         if (startPixels < 0) {
             cssClass += " truncated-start";
         }
-        result.setWidth(forCSS(getWidthPixels(datesMapper, queueElement)));
 
-        result.appendChild(generateNonWorkableShade(datesMapper, queueElement));
+        int taskWidth = getWidthPixels(datesMapper, queueElement);
+        if ((startPixels + taskWidth) > datesMapper.getHorizontalSize()) {
+            taskWidth = datesMapper.getHorizontalSize() - startPixels;
+            cssClass += " truncated-end";
+        } else {
+            result.appendChild(generateNonWorkableShade(datesMapper,
+                    queueElement));
+        }
+
+        result.setWidth(forCSS(taskWidth));
+
         result.setClass(cssClass);
 
         return result;
diff --git a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
index b3633b36e..67ea87b8e 100644
--- a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
+++ b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
@@ -707,6 +707,9 @@ div.limitingresourcesleftpane  {
     position:absolute;
 }
 
+.queue-element.truncated-end {
+    -moz-border-radius: 12px 0 0 12px;
+}
 
 /* ---------- End Limiting resources ----------------- */