diff --git a/castle/cms/browser/configure.zcml b/castle/cms/browser/configure.zcml
index 6471f3bb4..3a99639fc 100644
--- a/castle/cms/browser/configure.zcml
+++ b/castle/cms/browser/configure.zcml
@@ -309,7 +309,7 @@
 
   <browser:page
     for="*"
-    name="breadcrumbs_view"
+    name="castle_breadcrumbs_view"
     class=".navigation.PhysicalNavigationBreadcrumbs"
     permission="zope2.View"
     allowed_attributes="breadcrumbs"
diff --git a/castle/cms/browser/navigation.py b/castle/cms/browser/navigation.py
index dbccf4fad..246b8bf10 100644
--- a/castle/cms/browser/navigation.py
+++ b/castle/cms/browser/navigation.py
@@ -1,6 +1,7 @@
 from Products.CMFCore.interfaces import ISiteRoot
 from Products.CMFCore.WorkflowCore import WorkflowException
 from Acquisition import aq_inner
+from Products.CMFCore.interfaces import IContentish
 from Products.CMFPlone import utils
 from Products.CMFPlone.browser.interfaces import INavigationBreadcrumbs
 from Products.CMFPlone.interfaces import IHideFromBreadcrumbs
@@ -14,6 +15,21 @@
 class PhysicalNavigationBreadcrumbs(BrowserView):
 
     def breadcrumbs(self):
+        # get actual context object if only site root is passed in as context
+        site = api.portal.get()
+        if self.context == site:
+            context_url = self.request.URL
+            site_url = site.absolute_url()
+            path = context_url.replace(site_url, '')
+            if '/layout_view' in path:
+                path = path.replace('/layout_view', '')
+            try:
+                context = api.content.get(path)
+                if IContentish.providedBy(context):
+                    self.context = context
+            except Exception:
+                return []
+
         context = aq_inner(self.context)
 
         view_utils = Utils(self.context, self.request)
diff --git a/castle/cms/toolbar.py b/castle/cms/toolbar.py
index 23c2703b2..0b8ad9b34 100644
--- a/castle/cms/toolbar.py
+++ b/castle/cms/toolbar.py
@@ -543,7 +543,7 @@ def __call__(self):
                                       ['object_buttons', 'object'])
 
         breadcrumbs_view = getMultiAdapter((self.real_context, self.request),
-                                           name='breadcrumbs_view')
+                                           name='castle_breadcrumbs_view')
 
         user_menu = self.get_menu('user_menu', ['user'])
         management_menu = self.get_menu('management_menu')