diff --git a/src/main/java/forge/deck/generate/Generate2ColorDeck.java b/src/main/java/forge/deck/generate/Generate2ColorDeck.java
index a5ada6216cd..2ab806e2d94 100644
--- a/src/main/java/forge/deck/generate/Generate2ColorDeck.java
+++ b/src/main/java/forge/deck/generate/Generate2ColorDeck.java
@@ -128,7 +128,9 @@ public class Generate2ColorDeck {
 
         // reduce to cards that match the colors
         CardList cl1 = allCards.getColor(this.color1);
-        cl1.addAll(allCards.getColor(Constant.Color.COLORLESS));
+        if(!Singletons.getModel().getPreferences().isDeckGenRmvArtifacts()) {
+            cl1.addAll(allCards.getColor(Constant.Color.COLORLESS));
+        }
         CardList cl2 = allCards.getColor(this.color2);
 
         // remove multicolor cards that don't match the colors
diff --git a/src/main/java/forge/view/swing/OldGuiNewGame.java b/src/main/java/forge/view/swing/OldGuiNewGame.java
index 13143bbd833..334d33ab4cc 100644
--- a/src/main/java/forge/view/swing/OldGuiNewGame.java
+++ b/src/main/java/forge/view/swing/OldGuiNewGame.java
@@ -262,6 +262,7 @@ public class OldGuiNewGame extends JFrame {
         final JMenu generatedDeck = new JMenu(ForgeProps.getLocalized(NewConstants.Lang.OldGuiNewGame.MenuBar.Options.Generate.TITLE));
         
         generatedDeck.add(OldGuiNewGame.singletons);
+        OldGuiNewGame.singletons.setSelected(Singletons.getModel().getPreferences().isDeckGenSingletons());
         OldGuiNewGame.singletons.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(final ActionEvent arg0) {
@@ -269,17 +270,9 @@ public class OldGuiNewGame extends JFrame {
                         .setDeckGenSingletons(OldGuiNewGame.singletons.isSelected());
             }
         });
-
-        generatedDeck.add(OldGuiNewGame.removeSmallCreatures);
-        OldGuiNewGame.removeSmallCreatures.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(final ActionEvent arg0) {
-                Singletons.getModel().getPreferences()
-                        .setDeckGenRmvSmall(OldGuiNewGame.removeSmallCreatures.isSelected());
-            }
-        });
         
         generatedDeck.add(OldGuiNewGame.removeSmallCreatures);
+        OldGuiNewGame.removeSmallCreatures.setSelected(Singletons.getModel().getPreferences().isDeckGenRmvSmall());
         OldGuiNewGame.removeSmallCreatures.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(final ActionEvent arg0) {
@@ -289,6 +282,7 @@ public class OldGuiNewGame extends JFrame {
         });
 
         generatedDeck.add(OldGuiNewGame.removeArtifacts);
+        OldGuiNewGame.removeArtifacts.setSelected(Singletons.getModel().getPreferences().isDeckGenRmvArtifacts());
         OldGuiNewGame.removeArtifacts.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(final ActionEvent arg0) {