diff --git a/src/components/maintenance/ProfileView.svelte b/src/components/maintenance/ProfileView.svelte
index 4016620..7a01c62 100644
--- a/src/components/maintenance/ProfileView.svelte
+++ b/src/components/maintenance/ProfileView.svelte
@@ -1,6 +1,8 @@
 <script>
     /** @type {import('$lib/extension/entities/MaintenanceProfile.js').default} */
     export let profile;
+
+    const sortedTagsList = profile.settings.tags.sort((a, b) => a.localeCompare(b));
 </script>
 
 <div class="block">
@@ -10,7 +12,7 @@
 <div class="block">
     <strong>Tags:</strong>
     <div class="tags-list">
-        {#each profile.settings.tags as tagName}
+        {#each sortedTagsList as tagName}
             <span class="tag">{tagName}</span>
         {/each}
     </div>
diff --git a/src/routes/settings/maintenance/[id]/edit/+page.svelte b/src/routes/settings/maintenance/[id]/edit/+page.svelte
index 2214cb3..296f4ce 100644
--- a/src/routes/settings/maintenance/[id]/edit/+page.svelte
+++ b/src/routes/settings/maintenance/[id]/edit/+page.svelte
@@ -28,7 +28,7 @@
         if (maybeExistingProfile) {
             targetProfile = maybeExistingProfile;
             profileName = targetProfile.settings.name;
-            tagsList = [...targetProfile.settings.tags];
+            tagsList = [...targetProfile.settings.tags].sort((a, b) => a.localeCompare(b));
         } else {
             goto('/settings/maintenance');
         }