diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/identity-provider-mappers.html b/themes/src/main/resources/theme/base/admin/resources/partials/identity-provider-mappers.html
index c7c136b8bb..23705c08e9 100755
--- a/themes/src/main/resources/theme/base/admin/resources/partials/identity-provider-mappers.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/identity-provider-mappers.html
@@ -34,7 +34,7 @@
         </tr>
         </thead>
         <tbody>
-        <tr ng-repeat="mapper in mappers | filter:search">
+        <tr ng-repeat="mapper in mappers | filter:search | orderBy:'name'">
             <td><a href="#/realms/{{realm.realm}}/identity-provider-mappers/{{identityProvider.alias}}/mappers/{{mapper.id}}">{{mapper.name}}</a></td>
             <td>{{mapperTypes[mapper.identityProviderMapper].category}}</td>
             <td>{{mapperTypes[mapper.identityProviderMapper].name}}</td>
diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/session-realm.html b/themes/src/main/resources/theme/base/admin/resources/partials/session-realm.html
index 98b228427d..79232a05b0 100755
--- a/themes/src/main/resources/theme/base/admin/resources/partials/session-realm.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/session-realm.html
@@ -22,7 +22,7 @@
         </tr>
         </thead>
         <tbody>
-        <tr data-ng-repeat="data in stats">
+        <tr data-ng-repeat="data in stats | orderBy:'clientId'">
             <td><a href="#/realms/{{realm.realm}}/clients/{{data.id}}/sessions">{{data.clientId}}</a></td>
             <td>{{data.active}}</td>
             <td>{{data.offline}}</td>