diff --git a/spring-boot-admin-server-ui/src/main/frontend/i18n/i18n.de.json b/spring-boot-admin-server-ui/src/main/frontend/i18n/i18n.de.json
index 8dd629c484b..39de244a59f 100644
--- a/spring-boot-admin-server-ui/src/main/frontend/i18n/i18n.de.json
+++ b/spring-boot-admin-server-ui/src/main/frontend/i18n/i18n.de.json
@@ -26,6 +26,10 @@
     "fetching_data": "Lade Daten...",
     "fetch_failed": "Abruf der Daten fehlgeschlagen.",
     "float": "Float",
+    "group_by": {
+      "group": "Nach Gruppen gruppieren",
+      "application": "Nach Applikationen gruppieren"
+    },
     "hours": "{count} Stunde | {count} Stunden",
     "instance": "Instanz",
     "instances": "Instanzen",
diff --git a/spring-boot-admin-server-ui/src/main/frontend/i18n/i18n.en.json b/spring-boot-admin-server-ui/src/main/frontend/i18n/i18n.en.json
index 81230f07082..ba7fc09d03e 100644
--- a/spring-boot-admin-server-ui/src/main/frontend/i18n/i18n.en.json
+++ b/spring-boot-admin-server-ui/src/main/frontend/i18n/i18n.en.json
@@ -33,6 +33,10 @@
     "fetch_failed": "Fetching of data failed.",
     "float": "Float",
     "filter": "Filter",
+    "group_by": {
+      "group": "Group by group",
+      "application": "Group by application"
+    },
     "hours": "{count} hour | {count} hours",
     "instance": "Instance",
     "instances": "Instances",
diff --git a/spring-boot-admin-server-ui/src/main/frontend/services/application.ts b/spring-boot-admin-server-ui/src/main/frontend/services/application.ts
index c1f7076e003..eadd8f3059c 100644
--- a/spring-boot-admin-server-ui/src/main/frontend/services/application.ts
+++ b/spring-boot-admin-server-ui/src/main/frontend/services/application.ts
@@ -76,6 +76,7 @@ export const getStatusInfo = (applications: Application[]) => {
 
 class Application {
   public readonly name: string;
+  public readonly group: string;
   public readonly instances: Instance[];
   public readonly buildVersion? = {} as { value: string };
   public readonly status: string;
diff --git a/spring-boot-admin-server-ui/src/main/frontend/views/wallboard/index.vue b/spring-boot-admin-server-ui/src/main/frontend/views/wallboard/index.vue
index 0c3c55ee205..27ca2d1c4df 100644
--- a/spring-boot-admin-server-ui/src/main/frontend/views/wallboard/index.vue
+++ b/spring-boot-admin-server-ui/src/main/frontend/views/wallboard/index.vue
@@ -47,6 +47,25 @@
           />
         </optgroup>
       </select>
+
+      <div v-if="groupNames.length > 1" class="text-right rounded h-full">
+        <sba-button-group>
+          <sba-button
+            size="base"
+            :title="t('term.group_by.application')"
+            @click="() => (routerState.sortBy = 'name')"
+          >
+            <font-awesome-icon icon="list" />
+          </sba-button>
+          <sba-button
+            size="base"
+            :title="t('term.group_by.group')"
+            @click="() => (routerState.sortBy = 'group')"
+          >
+            <font-awesome-icon icon="expand" />
+          </sba-button>
+        </sba-button-group>
+      </div>
     </div>
 
     <sba-alert
@@ -77,6 +96,7 @@
       >
         <template #item="{ item: application }">
           <div :key="application.name" class="hex__body application">
+            <div class="application__group" v-text="application.group" />
             <div class="application__status-indicator" />
             <div class="application__header application__time-ago is-muted">
               <sba-time-ago :date="application.statusTimestamp" />
@@ -84,6 +104,7 @@
             <div class="application__body">
               <h1 class="application__name" v-text="application.name" />
               <p
+                v-if="application.instances"
                 class="application__instances is-muted"
                 v-text="
                   t('wallboard.instances_count', application.instances.length)
@@ -121,12 +142,26 @@ export default {
     const routerState = useRouterState({
       termFilter: '',
       wordWrap: true,
+      sortBy: 'name',
       statusFilter: 'none',
     });
 
     const { applications, applicationsInitialized, error } =
       useApplicationStore();
 
+    const groupNames = computed(() => {
+      return [
+        ...new Set<string>(
+          applications.value
+            .flatMap((application) => application.instances)
+            .map(
+              (instance) =>
+                instance.registration?.metadata?.['group'] ?? 'Ungrouped',
+            ),
+        ),
+      ];
+    });
+
     const fuse = computed(
       () =>
         new Fuse<Application>(applications.value, {
@@ -160,7 +195,7 @@ export default {
       let result = filterByTerm();
       result = filterByStatus(result);
 
-      return result;
+      return sortApplicationsBy(result, routerState.sortBy);
     });
 
     const healthStatus = computed(() => {
@@ -176,6 +211,7 @@ export default {
       t,
       healthStatus,
       routerState,
+      groupNames,
     };
   },
   methods: {
@@ -184,6 +220,7 @@ export default {
       if (!application) {
         return null;
       }
+
       if (application.status === HealthStatus.UP) {
         return 'up';
       }
@@ -199,13 +236,11 @@ export default {
       if (application.status === HealthStatus.OFFLINE) {
         return 'down';
       }
-      if (application.status === HealthStatus.UNKNOWN) {
-        return 'unknown';
-      }
-      return '';
+
+      return 'unknown';
     },
     select(application: Application) {
-      if (application.instances.length === 1) {
+      if (application.instances?.length === 1) {
         this.$router.push({
           name: 'instances/details',
           params: { instanceId: application.instances[0].id },
@@ -228,6 +263,31 @@ export default {
     });
   },
 };
+
+function sortApplicationsBy(
+  applications: Application[],
+  sortingCriterion: string,
+) {
+  const items = applications.flatMap((application: Application) => {
+    if (sortingCriterion === 'group') {
+      return application.instances.map((instance) => ({
+        ...instance,
+        status: application.status,
+        name: application.name,
+        group: instance.registration?.metadata?.['group'] ?? 'Ungrouped',
+      }));
+    } else {
+      return [application];
+    }
+  });
+  return items.sort((a: Application, b: Application) => {
+    if (sortingCriterion === 'group') {
+      return a.group.localeCompare(b.group);
+    } else {
+      return a.name.localeCompare(b.name);
+    }
+  });
+}
 </script>
 
 <style lang="postcss">
@@ -273,6 +333,18 @@ export default {
   margin-top: 0.5em;
 }
 
+.wallboard .application__group {
+  position: absolute;
+  top: 15%;
+  left: 0;
+  font-size: 40%;
+  transform: rotate(-30deg);
+  text-align: center;
+  width: 55%;
+  text-transform: uppercase;
+  font-weight: 700;
+}
+
 .up > polygon {
   stroke: theme('colors.green.400');
   fill: theme('colors.green.400');