diff --git a/phpBB/index.php b/phpBB/index.php
index 862eb5234f..5cf918cda2 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -39,7 +39,8 @@ $l_total_topic_s = ($total_topics == 0) ? 'TOTAL_TOPICS_ZERO' : 'TOTAL_TOPICS_OT
 $sql = 'SELECT group_id, group_name, group_colour, group_type
 	FROM ' . GROUPS_TABLE . '
 	WHERE group_legend = 1
-		AND group_type <> ' . GROUP_HIDDEN;
+		AND group_type <> ' . GROUP_HIDDEN . '
+	ORDER BY group_name ASC';
 $result = $db->sql_query($sql);
 
 $legend = '';
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php
index 60339ce8ad..569f5297f6 100644
--- a/phpBB/viewonline.php
+++ b/phpBB/viewonline.php
@@ -324,7 +324,8 @@ $pagination = generate_pagination(append_sid("{$phpbb_root_path}viewonline.$phpE
 // Grab group details for legend display
 $sql = 'SELECT group_id, group_name, group_colour, group_type
 	FROM ' . GROUPS_TABLE . '
-	WHERE group_legend = 1';
+	WHERE group_legend = 1
+	ORDER BY group_name ASC';
 $result = $db->sql_query($sql);
 
 $legend = '';