diff --git a/src/components/ha-zone-cards.js b/src/components/ha-zone-cards.js
index 163e76a73d..8daeb3ec47 100644
--- a/src/components/ha-zone-cards.js
+++ b/src/components/ha-zone-cards.js
@@ -27,7 +27,8 @@ function getPriority(domain) {
 }
 
 function entitySortBy(entity) {
-  return entity.entityDisplay.toLowerCase();
+  return entity.domain === 'group' ? entity.attributes.order :
+                                     entity.entityDisplay.toLowerCase();
 }
 
 export default new Polymer({