diff --git a/.gitignore b/.gitignore
index 228e678e6dc..7fb938da444 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,6 +53,7 @@ forge-gui-mobile-dev/fallback_skin/Thumbs.db
 forge-gui-mobile-dev/res
 forge-gui-mobile-dev/target
 forge-gui-mobile-dev/testAssets
+forge-gui-mobile/*.iml
 forge-gui-mobile/bin
 forge-gui-mobile/target
 forge-gui/forge-gui.iml
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestData.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestData.java
index 17cc3e4eccf..bb8daa8593b 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestData.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestData.java
@@ -49,7 +49,7 @@ public enum CSubmenuQuestData implements ICDoc {
         }
     };
 
-    List<Byte> preferredColors = new ArrayList<>();
+    private List<Byte> preferredColors = new ArrayList<>();
     private PoolType poolType = PoolType.BALANCED;
     private boolean includeArtifacts = true;
 
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseColors.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseColors.java
index e8e36387055..60ffa3ea960 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseColors.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseColors.java
@@ -133,9 +133,19 @@ public class DialogChooseColors {
                 cbxRed.setEnabled(radBalanced.isSelected());
                 cbxWhite.setEnabled(radBalanced.isSelected());
                 cbxColorless.setEnabled(radBalanced.isSelected());
+                cbxArtifacts.setEnabled(!radSurpriseMe.isSelected());
             }
         };
 
+        clearColors.setEnabled(radBalanced.isSelected());
+        cbxBlack.setEnabled(radBalanced.isSelected());
+        cbxBlue.setEnabled(radBalanced.isSelected());
+        cbxGreen.setEnabled(radBalanced.isSelected());
+        cbxRed.setEnabled(radBalanced.isSelected());
+        cbxWhite.setEnabled(radBalanced.isSelected());
+        cbxColorless.setEnabled(radBalanced.isSelected());
+        cbxArtifacts.setEnabled(!radSurpriseMe.isSelected());
+
         radBalanced.setToolTipText("A balanced distribution will provide a roughly equal number of cards in each selected color.");
         radRandom.setToolTipText("A random distribution will be almost entirely randomly selected. This ignores any color selections.");
         radSurpriseMe.setToolTipText("This is the same as a balanced distribution, except the colors picked will be random and you will not be told what they are.");
diff --git a/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java b/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java
index 54bbb2337bc..4b17b02a778 100644
--- a/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java
+++ b/forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java
@@ -78,7 +78,7 @@ public class NewQuestScreen extends FScreen {
                     }
                     obj.setBounds(xAdjustment, y, visWidth, h); //make label take up half of line so combo boxes all the same width
                     x += obj.getWidth();
-                    if (colorBoxCount == 3 || colorBoxCount == 6) {
+                    if (colorBoxCount % 3 == 0) {
                         y += h + gapY;
                         x = PADDING;
                     }
@@ -228,7 +228,7 @@ public class NewQuestScreen extends FScreen {
                 cbRed.setEnabled(radBalanced.isSelected());
                 cbWhite.setEnabled(radBalanced.isSelected());
                 cbColorless.setEnabled(radBalanced.isSelected());
-                cbIncludeArtifacts.setEnabled(radBalanced.isSelected());
+                cbIncludeArtifacts.setEnabled(!radSurpriseMe.isSelected());
             }
         };