diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestDraft.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestDraft.java
index 295109bf58a..7e6673bc22f 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestDraft.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestDraft.java
@@ -44,7 +44,7 @@ public enum CSubmenuQuestDraft implements ICDoc {
         });
         view.getBtnEditDeck().setCommand(new UiCommand() {
             @Override public void run() {
-                controller.editDeck();
+                view.editDeck(true);
             }
         });
         view.getBtnLeaveTournament().setCommand(new UiCommand() {
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestDraft.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestDraft.java
index 0a41074e8eb..8b599421267 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestDraft.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestDraft.java
@@ -652,7 +652,6 @@ public enum VSubmenuQuestDraft implements IVSubmenu<CSubmenuQuestDraft>, IQuestT
         CDeckEditorUI.SINGLETON_INSTANCE.setEditorController(draftController);
     }
 
-    @Override
     public void editDeck(boolean isExistingDeck) {
         final CDetailPicture cDetailPicture = CDeckEditorUI.SINGLETON_INSTANCE.getCDetailPicture();
         if (isExistingDeck) {
diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java
index a40bd28d384..04a12081f07 100644
--- a/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java
+++ b/forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java
@@ -75,19 +75,29 @@ public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestT
         btnSpendToken.setCommand(new FEventHandler() {
             @Override
             public void handleEvent(FEvent e) {
-                controller.spendToken();
+                FThreads.invokeInBackgroundThread(new Runnable() { //must run in background thread to handle alerts
+                    @Override
+                    public void run() {
+                        controller.spendToken();
+                    }
+                });
             }
         });
         btnEditDeck.setCommand(new FEventHandler() {
             @Override
             public void handleEvent(FEvent e) {
-                controller.editDeck();
+                editDeck(true);
             }
         });
         btnLeaveTournament.setCommand(new FEventHandler() {
             @Override
             public void handleEvent(FEvent e) {
-                controller.endTournamentAndAwardPrizes();
+                FThreads.invokeInBackgroundThread(new Runnable() { //must run in background thread to handle alerts
+                    @Override
+                    public void run() {
+                        controller.endTournamentAndAwardPrizes();
+                    }
+                });
             }
         });
         deckViewer.setCaption("Main Deck");
@@ -177,7 +187,6 @@ public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestT
         return null;
     }
 
-    @Override
     public void editDeck(boolean isExistingDeck) {
         Deck deck = getDeck();
         if (deck != null) {
diff --git a/forge-gui/src/main/java/forge/quest/QuestTournamentController.java b/forge-gui/src/main/java/forge/quest/QuestTournamentController.java
index e08beb7e421..ec4f1b42ee9 100644
--- a/forge-gui/src/main/java/forge/quest/QuestTournamentController.java
+++ b/forge-gui/src/main/java/forge/quest/QuestTournamentController.java
@@ -374,11 +374,6 @@ public class QuestTournamentController {
         view.populate();
     }
 
-    public void editDeck() {
-        view.editDeck(true);
-        FModel.getQuest().save();
-    }
-
     public void startDraft() {
         if (drafting) {
             SOptionPane.showErrorDialog("You are currently in a draft.\n" +