diff --git a/templates/wireguard/wireguard_peer_list.html b/templates/wireguard/wireguard_peer_list.html
index 4aa374a..365a38f 100644
--- a/templates/wireguard/wireguard_peer_list.html
+++ b/templates/wireguard/wireguard_peer_list.html
@@ -40,12 +40,12 @@
                         {% if show_only_disabled_peers %}
                             <a class="btn btn-outline-secondary"
                                href="{% url 'wireguard_peer_list' %}?uuid={{ current_instance.uuid }}">
-                            {% trans 'Enabled' %}
+                            {% trans 'Enabled Peers' %}
                             </a>
                         {% else %}
                             <a class="btn btn-outline-secondary"
                                href="{% url 'wireguard_peer_list' %}?uuid={{ current_instance.uuid }}&peer_status=disabled">
-                            {% trans 'Disabled' %}
+                            {% trans 'Disabled Peers' %}
                             </a>
                         {% endif %}
                     </div>
diff --git a/wireguard_peer/views.py b/wireguard_peer/views.py
index db5770a..292756c 100644
--- a/wireguard_peer/views.py
+++ b/wireguard_peer/views.py
@@ -99,7 +99,7 @@ def view_wireguard_peer_list(request):
     if current_instance:
         request.session['last_instance_uuid'] = str(current_instance.uuid)
         refresh_interval = current_instance.peer_list_refresh_interval
-        if user_has_access_to_instance(user_acl, current_instance):
+        if user_has_access_to_instance(user_acl, current_instance) and not show_only_disabled_peers:
             add_peer_enabled = True
 
     if settings.WIREGUARD_STATUS_CACHE_ENABLED: