diff --git a/modules/pi_control/pages/console.php b/modules/pi_control/pages/console.php
index 40afd0d..e485958 100644
--- a/modules/pi_control/pages/console.php
+++ b/modules/pi_control/pages/console.php
@@ -26,7 +26,7 @@ $tokenTtl = (int)($settings['terminal_token_ttl'] ?? 10);
 $tokenTtl = $tokenTtl > 0 ? $tokenTtl : 10;
 
 $hosts = $pdo->query('SELECT * FROM ' . $table('hosts') . ' ORDER BY name ASC')->fetchAll(PDO::FETCH_ASSOC);
-$commands = $pdo->query('SELECT * FROM ' . $table('commands') . ' ORDER BY label ASC')->fetchAll(PDO::FETCH_ASSOC);
+$commands = $pdo->query('SELECT * FROM ' . $table('commands') . ' ORDER BY COALESCE(sort_order, id) ASC, id ASC')->fetchAll(PDO::FETCH_ASSOC);
 
 $renderRuns = function (array $runs): string {
     ob_start();