diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index ee254c2c8..ee99ae002 100644
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -4013,11 +4013,13 @@ bool DivEngine::init() {
   return true;
 }
 
-bool DivEngine::quit() {
+bool DivEngine::quit(bool saveConfig) {
   deinitAudioBackend();
   quitDispatch();
-  logI("saving config.");
-  saveConf();
+  if (saveConfig) {
+    logI("saving config.");
+    saveConf();
+  }
   active=false;
   for (int i=0; i<DIV_MAX_OUTPUTS; i++) {
     if (oscBuf[i]!=NULL) delete[] oscBuf[i];
diff --git a/src/engine/engine.h b/src/engine/engine.h
index d7ec90586..0248dd94b 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -220,7 +220,7 @@ struct DivDispatchContainer {
   void fillBuf(size_t runtotal, size_t offset, size_t size);
   void clear();
   void init(DivSystem sys, DivEngine* eng, int chanCount, double gotRate, const DivConfig& flags, bool isRender=false);
-  void quit();
+  void quit(bool saveConfig=true);
   DivDispatchContainer():
     dispatch(NULL),
     bbInLen(0),
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 1d28fdf3f..170f58fa5 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -7242,8 +7242,12 @@ void FurnaceGUI::commitState() {
   }
 }
 
-bool FurnaceGUI::finish() {
+bool FurnaceGUI::finish(bool saveConfig) {
   commitState();
+  if (saveConfig) {
+    logI("saving config.");
+    saveConf();
+  }
   rend->quitGUI();
   ImGui_ImplSDL2_Shutdown();
   quitRender();
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 1188d78d1..e99964454 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -2735,7 +2735,7 @@ class FurnaceGUI {
     bool detectOutOfBoundsWindow(SDL_Rect& failing);
     int processEvent(SDL_Event* ev);
     bool loop();
-    bool finish();
+    bool finish(bool saveConfig=false);
     bool init();
     bool requestQuit();
     FurnaceGUI();