diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java b/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java
index 1852f49c2d5..9e8fc2f93d9 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java
@@ -216,6 +216,8 @@ public class VLobby implements ILobbyView {
             fdc.restoreSavedState();
             final FDeckChooser fdcom = getCommanderDeckChooser(iPlayer);
             fdcom.restoreSavedState();
+            final FDeckChooser fdtl = getTinyLeaderDeckChooser(iPlayer);
+            fdtl.restoreSavedState();
         }
     }
 
diff --git a/forge-gui/src/main/java/forge/limited/CardThemedCommanderDeckBuilder.java b/forge-gui/src/main/java/forge/limited/CardThemedCommanderDeckBuilder.java
index a35fa3bbff7..ab2887b2e25 100644
--- a/forge-gui/src/main/java/forge/limited/CardThemedCommanderDeckBuilder.java
+++ b/forge-gui/src/main/java/forge/limited/CardThemedCommanderDeckBuilder.java
@@ -537,7 +537,13 @@ public class CardThemedCommanderDeckBuilder extends DeckGeneratorBase {
         final Iterable<PaperCard> lands = Iterables.filter(aiPlayables,
                 Predicates.compose(CardRulesPredicates.Presets.IS_NONBASIC_LAND, PaperCard.FN_GET_RULES));
         List<PaperCard> landsToAdd = new ArrayList<>();
-        int minBasics=Math.round(r.nextInt(6)+3)*targetSize/60;//Keep a minimum number of basics to ensure playable decks
+        int minBasics;//Keep a minimum number of basics to ensure playable decks
+        if(colors.isMonoColor()){
+            minBasics=Math.round((r.nextInt(15)+6)*targetSize/60);
+        }else{
+            minBasics=Math.round((r.nextInt(8)+6)*targetSize/60);
+        }
+
 
         for (final PaperCard card : lands) {
             if (landsNeeded > minBasics) {