diff --git a/discover_overlay/text_settings.py b/discover_overlay/text_settings.py
index 36535d1..a315376 100644
--- a/discover_overlay/text_settings.py
+++ b/discover_overlay/text_settings.py
@@ -81,6 +81,15 @@ class TextSettingsWindow(SettingsWindow):
                 break
             idx += 1
 
+        idxg = 0
+        for g in self.guild_lookup:
+            if g == self.guild:
+                self.ignore_guild_change = True
+                self.guild_widget.set_active(idxg)
+                self.ignore_guild_change = False
+                break
+            idxg += 1
+
     def guild_list(self):
         guilds = []
         done = []