diff --git a/netbox/templates/generic/object.html b/netbox/templates/generic/object.html
index 8384b29e7..c00d955ef 100644
--- a/netbox/templates/generic/object.html
+++ b/netbox/templates/generic/object.html
@@ -5,6 +5,15 @@
 {% load perms %}
 {% load plugins %}
 
+{% block header %}
+  {# Breadcrumbs #}
+  <nav class="breadcrumb-container" aria-label="breadcrumb">
+    <ol class="breadcrumb">
+      {% block breadcrumbs %}{% endblock %}
+    </ol>
+  </nav>
+  {{ block.super }}
+{% endblock %}
 
 {% block title %}{{ object }}{% endblock %}
 
diff --git a/netbox/templates/layout.html b/netbox/templates/layout.html
index f96a64851..be3aabbf6 100644
--- a/netbox/templates/layout.html
+++ b/netbox/templates/layout.html
@@ -91,18 +91,10 @@
           {# Page header #}
           {% block header %}
             <div class="title-container">
+
+              {# Title #}
               <div id="content-title">
-
-                {# Title #}
                 <h1 class="h2 w-100">{% block title %}{% endblock %}</h1>
-
-                {# Breadcrumbs #}
-                <nav class="breadcrumb-container" aria-label="breadcrumb">
-                  <ol class="breadcrumb">
-                    {% block breadcrumbs %}{%endblock%}
-                  </ol>
-                </nav>
-
               </div>
 
               {# Controls #}