diff --git a/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java b/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java
index 2cf13216378..8f8c33009d5 100644
--- a/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java
+++ b/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java
@@ -232,7 +232,7 @@ public class PlayerPanel extends FContainer {
         setMayControl(mayControl0);
 
         //disable team combo boxes for now
-        cbTeam.setEnabled(false);
+        cbTeam.setEnabled(true);
     }
 
     public void initialize(FPref savedStateSetting, FPref savedStateSettingCommander, FPref savedStateSettingTinyLeader, DeckType defaultDeckType) {
diff --git a/forge-gui/src/main/java/forge/match/AbstractGuiGame.java b/forge-gui/src/main/java/forge/match/AbstractGuiGame.java
index 90f2a700a0f..027b521fd78 100644
--- a/forge-gui/src/main/java/forge/match/AbstractGuiGame.java
+++ b/forge-gui/src/main/java/forge/match/AbstractGuiGame.java
@@ -238,7 +238,12 @@ public abstract class AbstractGuiGame implements IGuiGame, IMayViewCards {
                 // Don't immediately close, wait for win/lose screen
                 return false;
             } else {
-                return true;
+                for(PlayerView player: getLocalPlayers()){
+                    if(!player.isAI()){
+                        getGameController(player).nextGameDecision(NextGameDecision.QUIT);
+                    }
+                }
+                return false;
             }
         }
         else if (spectator == null) {
@@ -421,7 +426,7 @@ public abstract class AbstractGuiGame implements IGuiGame, IMayViewCards {
      * @return null if choices is missing, empty, or if the users' choices are
      *         empty; otherwise, returns the first item in the List returned by
      *         getChoices.
-     * @see #getChoices(String, int, int, Object...)
+     * @see #getChoices(String, int, int, List)
      */
     @Override
     public <T> T oneOrNone(final String message, final List<T> choices) {