Index: ../../../modules/standard-templating-kit/trunk/magnolia-module-standard-templating-kit/src/main/java/info/magnolia/module/templatingkit/navigation/NavigationItem.java
===================================================================
--- ../../../modules/standard-templating-kit/trunk/magnolia-module-standard-templating-kit/src/main/java/info/magnolia/module/templatingkit/navigation/NavigationItem.java	(revision 23119)
+++ ../../../modules/standard-templating-kit/trunk/magnolia-module-standard-templating-kit/src/main/java/info/magnolia/module/templatingkit/navigation/NavigationItem.java	Mon Dec 21 11:59:22 CET 2009
@@ -84,12 +84,12 @@
 
     public boolean isSelected(){
         // if a sub page is selected and the menu ends here
-        final String selectedPath = getRoot().getSelectedNode().getHandle();
+        final String selectedUUID = getRoot().getSelectedNode().getUUID();
         if(isLeaf()){
-            return selectedPath.startsWith(this.content.getHandle());
+            return selectedUUID.equals(this.content.getUUID());
         }
         else{
-            return this.content.getHandle().equals(selectedPath);
+            return this.content.getUUID().equals(selectedUUID);
         }
     }
 
Index: ../../../modules/standard-templating-kit/trunk/magnolia-module-standard-templating-kit/src/main/java/info/magnolia/module/templatingkit/navigation/NavigationModel.java
===================================================================
--- ../../../modules/standard-templating-kit/trunk/magnolia-module-standard-templating-kit/src/main/java/info/magnolia/module/templatingkit/navigation/NavigationModel.java	(revision 23119)
+++ ../../../modules/standard-templating-kit/trunk/magnolia-module-standard-templating-kit/src/main/java/info/magnolia/module/templatingkit/navigation/NavigationModel.java	Mon Dec 21 11:57:13 CET 2009
@@ -93,7 +93,7 @@
             if(item.isSelected()){
                 return item;
             }
-            else if(selectedNode.getHandle().startsWith(item.getContent().getHandle())){
+            else if(selectedNode.getUUID().equals(item.getContent().getUUID())){
                 if(item.isLeaf()){
                     // once we don't find a menu point we still fall back on the home
                     // otherwise the home would always match because content wise it is the shared parent