diff --git a/src/services/Fields.php b/src/services/Fields.php
index 77e99fd3ad2..b683f8de4be 100644
--- a/src/services/Fields.php
+++ b/src/services/Fields.php
@@ -1394,7 +1394,7 @@ private function _createFieldQuery(): Query
                 'fields.settings'
             ])
             ->from(['{{%fields}} fields'])
-            ->orderBy(['fields.name' => SORT_ASC]);
+            ->orderBy(['fields.name' => SORT_ASC, 'fields.handle' => SORT_ASC]);
     }
 
     /**