diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 46d12937b..f62256659 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -738,6 +738,7 @@ class RackView(generic.ObjectView):
             'next_rack': next_rack,
             'prev_rack': prev_rack,
             'svg_extra': svg_extra,
+            'peer_racks': peer_racks,
         }
 
 
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html
index e2cb1597e..916e58477 100644
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -18,12 +18,46 @@
 {% endblock %}
 
 {% block extra_controls %}
-  <a {% if prev_rack %}href="{% url 'dcim:rack' pk=prev_rack.pk %}{% endif %}" class="btn btn-sm btn-primary{% if not prev_rack %} disabled{% endif %}">
-    <i class="mdi mdi-chevron-left" aria-hidden="true"></i> Previous
-  </a>
-  <a {% if next_rack %}href="{% url 'dcim:rack' pk=next_rack.pk %}{% endif %}" class="btn btn-sm btn-primary{% if not next_rack %} disabled{% endif %}">
-    <i class="mdi mdi-chevron-right" aria-hidden="true"></i> Next
-  </a>
+  <div class="btn-group" role="group" aria-label="RackNavigation">
+    {% if prev_rack %}
+    <a href="{% url 'dcim:rack' pk=prev_rack.pk %}" class="btn btn-sm btn-primary">
+        <i class="mdi mdi-chevron-left" aria-hidden="true"></i> {{ prev_rack }}
+    </a>
+    {% else %}
+    <button class="btn btn-sm btn-primary">First</button>
+    {% endif %}
+    
+    {% if peer_racks %}
+      <div class="btn-group" role="group">
+        <button class="btn btn-sm btn-primary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">{{ object }}</button>
+        <ul class="dropdown-menu">
+        {% for peer_rack in peer_racks %}
+            <li><a class="dropdown-item" href="{% url 'dcim:rack' pk=peer_rack.pk %}">{{ peer_rack }}</a></li>
+        {% endfor %}
+        </ul>
+    </div>
+    {% endif %}
+
+    {% if next_rack %}
+    <a href="{% url 'dcim:rack' pk=next_rack.pk %}" class="btn btn-sm btn-primary">
+        <i class="mdi mdi-chevron-right" aria-hidden="true"></i> {{ next_rack }}
+    </a>
+    {% else %}
+    <button class="btn btn-sm btn-primary">Last</button>
+    {% endif %}
+
+  </div>
+  
+  <div class="btn-group" role="group" aria-label="RackNavigation">
+    {% if peer_racks %}
+      <div class="btn-group" role="group">
+        {% for peer_rack in peer_racks %}
+        <a class="btn btn-sm btn-primary{% if peer_rack.pk == object.pk %} active{% endif %}" href="{% url 'dcim:rack' pk=peer_rack.pk %}">{{ peer_rack }}</a>
+        {% endfor %}
+      </div>
+    {% endif %}
+  </div>
+
 {% endblock %}
 
 {% block content %}