--- a/Allura/allura/templates/jinja_master/top_nav.html
+++ b/Allura/allura/templates/jinja_master/top_nav.html
@@ -2,8 +2,15 @@
   {% for s in c.project.sitemap() %}
     <a href="{{s.url}}" class="ui-icon-{{s.ui_icon or 'admin'}}">
       {{s.label}}
-      {% if s.url in request.url %}
-        <span class="diamond"></span>
+      {% if s.label == 'Home' %}
+        {% set url_length = s.url|length %}
+        {% if request.url.rfind(s.url, -url_length) != -1 %}
+          <span class="diamond"></span>
+        {% endif %}
+      {% else %}
+        {% if s.url in request.upath_info or c.project.neighborhood.url()+'_admin' in request.upath_info %}
+          <span class="diamond"></span>
+        {% endif %}
       {% endif %}
     </a>
 	{% endfor %}