diff --git a/netbox/templates/virtualization/cluster/base.html b/netbox/templates/virtualization/cluster/base.html
index 082a4d37a..69b55ec6b 100644
--- a/netbox/templates/virtualization/cluster/base.html
+++ b/netbox/templates/virtualization/cluster/base.html
@@ -25,11 +25,7 @@
   {% endif %}
 {% endblock %}
 
-{% block tab_items %}
-  <li role="presentation" class="nav-item">
-    <a href="{{ object.get_absolute_url }}" class="nav-link{% if not active_tab %} active{% endif %}">Cluster</a>
-  </li>
-
+{% block extra_tabs %}
   {% with virtualmachine_count=object.virtual_machines.count %}
     <li role="presentation" class="nav-item">
       <a href="{% url 'virtualization:cluster_virtualmachines' pk=object.pk %}" class="nav-link{% if active_tab == 'virtual-machines' %} active{% endif %}">
@@ -37,7 +33,6 @@
       </a>
     </li>
   {% endwith %}
-
   {% with device_count=object.devices.count %}
     <li role="presentation" class="nav-item">
       <a href="{% url 'virtualization:cluster_devices' pk=object.pk %}" class="nav-link{% if active_tab == 'devices' %} active{% endif %}">
diff --git a/netbox/templates/virtualization/virtualmachine/base.html b/netbox/templates/virtualization/virtualmachine/base.html
index 4869a56ce..0c2f43de8 100644
--- a/netbox/templates/virtualization/virtualmachine/base.html
+++ b/netbox/templates/virtualization/virtualmachine/base.html
@@ -16,10 +16,7 @@
   {% endif %}
 {% endblock %}
 
-{% block tab_items %}
-  <li class="nav-item" role="presentation">
-    <a class="nav-link{% if not active_tab %} active{% endif %}" href="{{ object.get_absolute_url }}">Virtual Machine</a>
-  </li>
+{% block extra_tabs %}
   {% with interface_count=object.interfaces.count %}
       {% if interface_count %}
           <li class="nav-item" role="presentation">