diff --git a/source/java/org/alfresco/web/ui/repo/renderer/NodePathLinkRenderer.java b/source/java/org/alfresco/web/ui/repo/renderer/NodePathLinkRenderer.java
index dd84b3ef49..25a1fbda17 100644
--- a/source/java/org/alfresco/web/ui/repo/renderer/NodePathLinkRenderer.java
+++ b/source/java/org/alfresco/web/ui/repo/renderer/NodePathLinkRenderer.java
@@ -219,6 +219,7 @@ public class NodePathLinkRenderer extends BaseRenderer
       
       NodeRef lastElementRef = null;
       int size = (showLeaf ? path.size() : path.size() - 1);
+      int lastElementPos = (showLeaf ? path.size() - 1 : path.size() - 2);
       for (int i=0; i<size; i++)
       {
          Path.Element element = path.get(i);
@@ -230,7 +231,7 @@ public class NodePathLinkRenderer extends BaseRenderer
             {
                elementString = Repository.getNameForNode(getNodeService(context), elementRef.getChildRef());
             }
-            if (i == path.size() - 2)
+            if (i == lastElementPos)
             {
                lastElementRef = elementRef.getChildRef();
             }