diff --git a/modules/commands/cs_list.cpp b/modules/commands/cs_list.cpp
index d762a54ba..29c8a827b 100644
--- a/modules/commands/cs_list.cpp
+++ b/modules/commands/cs_list.cpp
@@ -74,7 +74,11 @@ class CommandCSList : public Command
 		ListFormatter list;
 		list.AddColumn("Name").AddColumn("Description");
 
+		Anope::map<ChannelInfo *> ordered_map;
 		for (registered_channel_map::const_iterator it = RegisteredChannelList->begin(), it_end = RegisteredChannelList->end(); it != it_end; ++it)
+			ordered_map[it->first] = it->second;
+
+		for (Anope::map<ChannelInfo *>::const_iterator it = ordered_map.begin(), it_end = ordered_map.end(); it != it_end; ++it)
 		{
 			const ChannelInfo *ci = it->second;
 
diff --git a/modules/commands/ns_list.cpp b/modules/commands/ns_list.cpp
index 7cbfc5b97..b96b21412 100644
--- a/modules/commands/ns_list.cpp
+++ b/modules/commands/ns_list.cpp
@@ -75,7 +75,11 @@ class CommandNSList : public Command
 
 		list.AddColumn("Nick").AddColumn("Last usermask");
 
+		Anope::map<NickAlias *> ordered_map;
 		for (nickalias_map::const_iterator it = NickAliasList->begin(), it_end = NickAliasList->end(); it != it_end; ++it)
+			ordered_map[it->first] = it->second;
+
+		for (Anope::map<NickAlias *>::const_iterator it = ordered_map.begin(), it_end = ordered_map.end(); it != it_end; ++it)
 		{
 			const NickAlias *na = it->second;