diff --git a/src/classes/app.py b/src/classes/app.py
index 3162872db..c29430d45 100644
--- a/src/classes/app.py
+++ b/src/classes/app.py
@@ -255,13 +255,6 @@ def gui(self):
         log.debug("Creating main interface window")
         self.window = MainWindow()
 
-        # Instantiate Theme Manager (Singleton)
-        theme_name = self.settings.get("theme")
-        theme = self.theme_manager.apply_theme(theme_name)
-
-        # Update theme in settings
-        self.settings.set("theme", theme.name)
-
         # Check for gui launch failures
         if self.mode == "quit":
             self.window.close()
diff --git a/src/windows/main_window.py b/src/windows/main_window.py
index 7a4a70bbe..745f4f57a 100644
--- a/src/windows/main_window.py
+++ b/src/windows/main_window.py
@@ -3485,6 +3485,11 @@ def __init__(self, *args):
         # Create tutorial manager
         self.tutorial_manager = TutorialManager(self)
 
+        # Apply theme
+        theme_name = s.get("theme")
+        theme = get_app().theme_manager.apply_theme(theme_name)
+        s.set("theme", theme.name)
+
         # Apply saved window geometry/state from settings
         if self.saved_geometry:
             self.restoreGeometry(self.saved_geometry)