diff --git a/plugins/Directory/lib/alphanav.php b/plugins/Directory/lib/alphanav.php
index dadb589094..87e2f18f18 100644
--- a/plugins/Directory/lib/alphanav.php
+++ b/plugins/Directory/lib/alphanav.php
@@ -128,8 +128,8 @@ class AlphaNav extends Widget
             $current = $this->action->arg('filter');
 
             // Highlight the selected filter. If there is no selected
-            // filter, highlight the first filter in the list
-            if (!isset($current) && $i == 0
+            // filter, highlight the last filter in the list (all)
+            if (!isset($current) && $i == ($size - 1)
                 || $current === strtolower($filter)) {
                 $classes .= 'current ';
             }