diff --git a/src/Config/Config.cpp b/src/Config/Config.cpp
index 2d34c2825..24a35310d 100644
--- a/src/Config/Config.cpp
+++ b/src/Config/Config.cpp
@@ -2157,15 +2157,12 @@ bool SaveAllSettings(bool bForceSaveSettings)
         }
     }
 
+    Style_ToIniSection(bForceSaveSettings);
     Style_FileExtToIniSection(bForceSaveSettings);
 
-    if (GetModeThemeIndex() == 1) {
-        Style_SaveSettings(bForceSaveSettings);
-    }
-
     ok = CloseSettingsFile(true, bOpenedByMe); // reset/clear cache
 
-    // separate INI files for Style-Themes
+    // maybe separate INI files for Style-Themes
     if (GetModeThemeIndex() >= 2) {
         Style_SaveSettings(bForceSaveSettings);
     }
diff --git a/src/Notepad3.c b/src/Notepad3.c
index 929545334..df58408ce 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -10358,6 +10358,9 @@ bool FileSave(bool bSaveAlways, bool bAsk, bool bSaveAs, bool bSaveCopy, bool bP
         if (SaveFileDlg(Globals.hwndMain, tchFile, COUNTOF(tchFile), StrIsNotEmpty(tchInitialDir) ? tchInitialDir : NULL)) {
 
             if (!bSaveCopy) {
+                if (bSaveAs) {
+                    SaveAllSettings(false); // session on old file ends, save side-by-side settings
+                }
                 InstallFileWatching(false);
             }
             fSuccess = FileIO(false, tchFile, &fioStatus, true, true, false, true, bSaveCopy, bPreserveTimeStamp);