diff --git a/src/main/java/forge/control/match/ControlDock.java b/src/main/java/forge/control/match/ControlDock.java
index 8d54ef60078..2407ce12895 100644
--- a/src/main/java/forge/control/match/ControlDock.java
+++ b/src/main/java/forge/control/match/ControlDock.java
@@ -54,7 +54,6 @@ public class ControlDock {
 
     /** Concede game, bring up WinLose UI. */
     public void concede() {
-        AllZone.getDisplay().savePrefs();
         AllZone.getHumanPlayer().concede();
         AllZone.getGameAction().checkStateEffects();
     }
diff --git a/src/main/java/forge/control/match/ControlWinLose.java b/src/main/java/forge/control/match/ControlWinLose.java
index 6c6f988f26b..fd2295c3527 100644
--- a/src/main/java/forge/control/match/ControlWinLose.java
+++ b/src/main/java/forge/control/match/ControlWinLose.java
@@ -75,6 +75,7 @@ public class ControlWinLose {
     /** Action performed when "quit" button is pressed in default win/lose UI. */
     public void actionOnQuit() {
         AllZone.getMatchState().reset();
+        AllZone.getDisplay().savePrefs();
         FControl g = ((GuiTopLevel) AllZone.getDisplay()).getController();
         g.getMatchController().deinitMatch();
         g.changeState(FControl.HOME_SCREEN);
@@ -121,6 +122,7 @@ public class ControlWinLose {
                 Constant.Runtime.HUMAN_DECK[0] = hDeck;
             }
         }
+        AllZone.getDisplay().savePrefs();
         AllZone.getGameAction().newGame(Constant.Runtime.HUMAN_DECK[0], Constant.Runtime.COMPUTER_DECK[0]);
     }
 
diff --git a/src/main/java/forge/quest/gui/QuestWinLoseHandler.java b/src/main/java/forge/quest/gui/QuestWinLoseHandler.java
index 78d8638354f..0a5b8756743 100644
--- a/src/main/java/forge/quest/gui/QuestWinLoseHandler.java
+++ b/src/main/java/forge/quest/gui/QuestWinLoseHandler.java
@@ -116,6 +116,8 @@ public class QuestWinLoseHandler extends ControlWinLose {
      */
     @Override
     public final void startNextRound() {
+        AllZone.getDisplay().savePrefs();
+
         if (Constant.Quest.FANTASY_QUEST[0]) {
             int extraLife = 0;
 
@@ -299,6 +301,8 @@ public class QuestWinLoseHandler extends ControlWinLose {
 
         this.model.qData.saveData();
 
+        AllZone.getDisplay().savePrefs();
+
         FControl g = ((GuiTopLevel) AllZone.getDisplay()).getController();
         g.getMatchController().deinitMatch();
         g.changeState(FControl.HOME_SCREEN);