diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 62e116c14..22c75c907 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -20,6 +20,10 @@
  - better HTML compliancy
  - fixed a lot of POD
  - fix - Changing rank ot the asset (Martin kamerbeek / Procolix)
+ - Fixed a bug where context menu links would take on the properties of the
+   page.
+ - Added a context menu to the last item in the crumb trail in the asset
+   manager as discussed in Community IRC.
 
 6.99.1
  - Bugfixes on dashboard to fix template errors.
diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index 66690a42e..c8cb6b127 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -1077,9 +1077,25 @@ sub manageAssets {
 	my $ancestors = $self->getLineage(["self","ancestors"],{returnObjects=>1});
         my @crumbtrail;
         foreach my $ancestor (@{$ancestors}) {
-                push(@crumbtrail,'<a href="'.$ancestor->getUrl("func=manageAssets").'">'.$ancestor->getTitle.'</a>');
+		if ($ancestor->getId eq $self->getId) {
+			my $title = $self->getTitle;
+			$title =~ s/\'/\\\'/g;
+			my $more = '<script type="text/javascript">
+				var ct_contextMenu = new contextMenu_createWithLink("ct_'.$self->getId.'","'.$title.'");
+               		 	ct_contextMenu.addLink("'.$self->getUrl("func=changeUrl;proceed=manageAssets").'","'.$i18n->get("change url").'");
+                		ct_contextMenu.addLink("'.$self->getUrl("func=editBranch").'","'.$i18n->get("edit branch").'");
+                		ct_contextMenu.addLink("'.$self->getUrl("func=createShortcut;proceed=manageAssets").'","'.$i18n->get("create shortcut").'");
+				ct_contextMenu.addLink("'.$self->getUrl("func=manageRevisions").'","'.$i18n->get("revisions").'");
+                		ct_contextMenu.addLink("'.$self->getUrl.'","'.$i18n->get("view").'"); '."\n";
+			$more .= 'ct_contextMenu.addLink("'.$self->getUrl("func=edit;proceed=manageAssets").'","'.$i18n->get("edit").'");' unless ($self->isLocked);
+			$more .= 'ct_contextMenu.addLink("'.$self->getUrl("func=lock;proceed=manageAssets").'","'.$i18n->get("lock").'");' unless ($self->isLocked);
+			$more .= "\nct_contextMenu.print();\n</script>\n";
+                	push(@crumbtrail,$more);
+		} else {
+                	push(@crumbtrail,'<a href="'.$ancestor->getUrl("func=manageAssets").'">'.$ancestor->getTitle.'</a>');
+		}
         }
-	my $output = '<div class="am-crumbtrail">'.join(" > ",@crumbtrail).'</div>';
+	my $output = '<div class="am-crumbtrail">'.join(" &gt; ",@crumbtrail).'</div>';
 	$output .= "
    <script type=\"text/javascript\">
    //<![CDATA[
diff --git a/www/extras/contextMenu/contextMenu.css b/www/extras/contextMenu/contextMenu.css
index 82a2d1aae..efcc47c06 100644
--- a/www/extras/contextMenu/contextMenu.css
+++ b/www/extras/contextMenu/contextMenu.css
@@ -17,7 +17,7 @@
         border-right: 3px groove #999999;
         border-left: 0px groove #999999;
 }
-.contextMenu_skin A {
+.contextMenu_skin A, .contextMenu_skin A:link, .contextMenu_skin A:visited {
 	font-weight: normal;
         width: 100%;
         color: black;