diff --git a/discover_overlay/discord_connector.py b/discover_overlay/discord_connector.py
index 32c754d..ff48987 100644
--- a/discover_overlay/discord_connector.py
+++ b/discover_overlay/discord_connector.py
@@ -338,9 +338,9 @@ class DiscordConnector:
             for channel in j["data"]["channels"]:
                 channel['guild_id'] = j['nonce']
                 channel['guild_name'] = self.guilds[j['nonce']]["name"]
-                self.channels[channel["id"]] = channel
-                if channel["type"] == 2:
-                    self.req_channel_details(channel["id"])
+                # self.channels[channel["id"]] = channel
+                if channel["type"] in [0, 2]:
+                    self.req_channel_details(channel["id"], guild_id=j["nonce"])
             self.check_guilds()
             return
         elif j["cmd"] == "SUBSCRIBE":
@@ -466,7 +466,7 @@ class DiscordConnector:
             "args": {
                 "channel_id": channel
             },
-            "nonce": channel
+            "nonce": guild_id and guild_id or channel
         }
         self.websocket.send(json.dumps(cmd))
 
diff --git a/discover_overlay/text_settings.py b/discover_overlay/text_settings.py
index 44abe88..3495897 100644
--- a/discover_overlay/text_settings.py
+++ b/discover_overlay/text_settings.py
@@ -173,6 +173,10 @@ class TextSettingsWindow(SettingsWindow):
         """
         Set the contents of list_channels
         """
+        if in_list != {}:
+            print(in_list)
+            in_list = {k: v for k, v in sorted(in_list.items(), key=lambda i: i[1]["position"])}
+
         self.list_channels = in_list
         self.list_channels_keys = []
         for (key, _value) in enumerate(in_list):