diff --git a/phpBB/index.php b/phpBB/index.php
index b5716bc6b6..f50f727f0d 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -66,11 +66,11 @@ if($total_categories)
 		$limit_forums = " WHERE f.cat_id = $viewcat ";
 	}
 	$sql = "SELECT f.*, u.username, u.user_id, p.post_time
-		FROM ".FORUMS_TABLE." f
+		FROM ".FORUMS_TABLE." f 
 		LEFT JOIN ".POSTS_TABLE." p ON p.post_id = f.forum_last_post_id
 		LEFT JOIN ".USERS_TABLE." u ON u.user_id = p.poster_id
 		$limit_forums
-		ORDER BY f.forum_id";
+		ORDER BY f.cat_id, f.forums_order";
 	if(!$q_forums = $db->sql_query($sql))
 	{
 		error_die($db, QUERY_ERROR);