diff --git a/apps/client/src/services/command_registry.ts b/apps/client/src/services/command_registry.ts
index 64b84918d..a6c1000b7 100644
--- a/apps/client/src/services/command_registry.ts
+++ b/apps/client/src/services/command_registry.ts
@@ -169,7 +169,12 @@ class CommandRegistry {
     }
 
     getAllCommands(): CommandDefinition[] {
-        return Array.from(this.commands.values());
+        const commands = Array.from(this.commands.values());
+
+        // Sort commands by name
+        commands.sort((a, b) => a.name.localeCompare(b.name));
+
+        return commands;
     }
 
     searchCommands(query: string): CommandDefinition[] {