diff --git a/src/main/java/forge/control/home/ControlQuest.java b/src/main/java/forge/control/home/ControlQuest.java
index eeeab1a57ff..a0fbef83d9b 100644
--- a/src/main/java/forge/control/home/ControlQuest.java
+++ b/src/main/java/forge/control/home/ControlQuest.java
@@ -84,15 +84,16 @@ public class ControlQuest {
     }
 
     private void addListeners() {
-        view.getBtnStart().removeMouseListener(madStartGame);
-        view.getBtnStart().addMouseListener(madStartGame);
+        if (view.hasPreviousQuest()) {
+            view.getBtnStart().removeMouseListener(madStartGame);
+            view.getBtnStart().addMouseListener(madStartGame);
 
-        view.getPetComboBox().removeActionListener(actPetSelect);
-        view.getPetComboBox().addActionListener(actPetSelect);
-
-        view.getPlantCheckBox().removeActionListener(actPlantSelect);
-        view.getPlantCheckBox().addActionListener(actPlantSelect);
+            view.getPetComboBox().removeActionListener(actPetSelect);
+            view.getPetComboBox().addActionListener(actPetSelect);
 
+            view.getPlantCheckBox().removeActionListener(actPlantSelect);
+            view.getPlantCheckBox().addActionListener(actPlantSelect);
+        }
     }
 
     /** @return ViewQuest */