diff --git a/src/Repositories/AliasRepository.php b/src/Repositories/AliasRepository.php
index 668afbc..9a4d615 100644
--- a/src/Repositories/AliasRepository.php
+++ b/src/Repositories/AliasRepository.php
@@ -11,11 +11,11 @@ class AliasRepository extends BaseRepository
 {
     public function fetchAliasesForUserId(int $userId): array
     {
-        $statement = $this->pdo->prepare('SELECT * FROM mail_aliases WHERE user_id = :user_id ORDER BY mail_address');
+        $statement = $this->pdo->prepare('SELECT * FROM mail_aliases WHERE user_id = :user_id ORDER BY wildcard_priority, mail_address');
         $statement->execute(['user_id' => $userId]);
         $rows = $statement->fetchAll(PDO::FETCH_ASSOC);
 
-        // Create Account models from rows
+        // Create Alias models from rows
         $aliasList = [];
         foreach ($rows as $row) {
             $aliasList[] = Alias::createFromArray($row);