diff --git a/Themes/default/BGAnimations/ScreenTitleMenu underlay.lua b/Themes/default/BGAnimations/ScreenTitleMenu underlay.lua
index f7a82ba2a7..ad97d9590b 100644
--- a/Themes/default/BGAnimations/ScreenTitleMenu underlay.lua	
+++ b/Themes/default/BGAnimations/ScreenTitleMenu underlay.lua	
@@ -1,7 +1,15 @@
 InitUserPrefs();
 
 local t = Def.ActorFrame {
-	BeginCommand=function(self) ThemePrefs.ForceSave() end;
+	BeginCommand=function(self)
+		if not FILEMAN:DoesFileExist("Save/ThemePrefs.ini") then
+			ThemePrefs.ForceSave()
+		end
+
+		if ThemePrefs.NeedsSaved == true then
+			ThemePrefs.Save()
+		end
+	end;
 };
 
 t[#t+1] = StandardDecorationFromFileOptional("Logo","Logo");