diff --git a/panels/config/group/ha-config-section-group.html b/panels/config/group/ha-config-section-group.html
index b83f74fea9..dbee3b5f06 100644
--- a/panels/config/group/ha-config-section-group.html
+++ b/panels/config/group/ha-config-section-group.html
@@ -8,6 +8,7 @@
 <link rel='import' href='../../../bower_components/paper-item/paper-item.html'>
 
 <link rel="import" href="../../../src/resources/ha-style.html">
+<link rel="import" href="../../../src/util/hass-util.html">
 
 <link rel="import" href="../ha-config-section.html">
 <link rel="import" href="../ha-entity-config.html">
@@ -71,15 +72,7 @@ Polymer({
         return (window.hassUtil.computeDomain(entity) === 'group' &&
                 !entity.attributes.auto);
       })
-      .sort(function (entityA, entityB) {
-        if (entityA.entity_id < entityB.entity_id) {
-          return -1;
-        }
-        if (entityA.entity_id > entityB.entity_id) {
-          return 1;
-        }
-        return 0;
-      });
+      .sort(window.hassUtil.sortByName);
   },
 });
 </script>
diff --git a/panels/config/z-wave/ha-config-section-zwave.html b/panels/config/z-wave/ha-config-section-zwave.html
index 486171fd10..0b12ad7262 100644
--- a/panels/config/z-wave/ha-config-section-zwave.html
+++ b/panels/config/z-wave/ha-config-section-zwave.html
@@ -8,6 +8,7 @@
 <link rel='import' href='../../../bower_components/paper-item/paper-item.html'>
 
 <link rel="import" href="../../../src/resources/ha-style.html">
+<link rel="import" href="../../../src/util/hass-util.html">
 
 <link rel="import" href="../ha-config-section.html">
 <link rel="import" href="../ha-entity-config.html">
@@ -68,15 +69,7 @@ Polymer({
         return (!ent.attributes.hidden &&
                 'node_id' in ent.attributes);
       })
-      .sort(function (entityA, entityB) {
-        if (entityA.entity_id < entityB.entity_id) {
-          return -1;
-        }
-        if (entityA.entity_id > entityB.entity_id) {
-          return 1;
-        }
-        return 0;
-      });
+      .sort(window.hassUtil.sortByName);
   },
 });
 </script>