diff --git a/forge-gui/src/main/java/forge/gui/deckchooser/FDeckChooser.java b/forge-gui/src/main/java/forge/gui/deckchooser/FDeckChooser.java
index f395bdbd865..16011594362 100644
--- a/forge-gui/src/main/java/forge/gui/deckchooser/FDeckChooser.java
+++ b/forge-gui/src/main/java/forge/gui/deckchooser/FDeckChooser.java
@@ -180,7 +180,7 @@ public class FDeckChooser extends JPanel implements IDecksComboBoxListener {
         lstDecks.setAllowMultipleSelections(false);
 
         lstDecks.setPool(DeckProxy.getAllPreconstructedDecks(QuestController.getPrecons()));
-        lstDecks.update(false, true);
+        lstDecks.update(false, true, true);
 
         btnRandom.setText("Random Deck");
         btnRandom.setCommand(new UiCommand() {
@@ -197,7 +197,7 @@ public class FDeckChooser extends JPanel implements IDecksComboBoxListener {
         lstDecks.setAllowMultipleSelections(false);
 
         lstDecks.setPool(DeckProxy.getAllQuestEventAndChallenges());
-        lstDecks.update(false, true);
+        lstDecks.update(false, true, true);
 
         btnRandom.setText("Random Deck");
         btnRandom.setCommand(new UiCommand() {
diff --git a/forge-gui/src/main/java/forge/gui/home/quest/CSubmenuQuestDecks.java b/forge-gui/src/main/java/forge/gui/home/quest/CSubmenuQuestDecks.java
index 40854450da0..a7485fcf2cf 100644
--- a/forge-gui/src/main/java/forge/gui/home/quest/CSubmenuQuestDecks.java
+++ b/forge-gui/src/main/java/forge/gui/home/quest/CSubmenuQuestDecks.java
@@ -76,7 +76,7 @@ public enum CSubmenuQuestDecks implements ICDoc {
         boolean hasQuest = qData.getAssets() != null;
         // Retrieve and set all decks
         view.getLstDecks().setPool(DeckProxy.getAllQuestDecks(hasQuest ? qData.getMyDecks() : null));
-        view.getLstDecks().update();
+        view.getLstDecks().update(false, false, true);
 
         // Look through list for preferred deck from prefs
         final DeckProxy deck = hasQuest ? view.getLstDecks().stringToItem(Singletons.getModel().getQuestPreferences().getPref(QPref.CURRENT_DECK)) : null;
diff --git a/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuDraft.java b/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuDraft.java
index 526702e14d5..32155d48468 100644
--- a/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuDraft.java
+++ b/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuDraft.java
@@ -77,7 +77,7 @@ public enum CSubmenuDraft implements ICDoc {
         final JButton btnStart = view.getBtnStart();
 
         view.getLstDecks().setPool(DeckProxy.getDraftDecks(Singletons.getModel().getDecks().getDraft()));
-        view.getLstDecks().update();
+        view.getLstDecks().update(false, false, true);
 
         if (!view.getLstDecks().getPool().isEmpty()) {
             btnStart.setEnabled(true);
diff --git a/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java b/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java
index 3fd0c184aca..07220d9aa0a 100644
--- a/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java
+++ b/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java
@@ -101,7 +101,7 @@ public enum CSubmenuSealed implements ICDoc {
 
         final VSubmenuSealed view = VSubmenuSealed.SINGLETON_INSTANCE;
         view.getLstDecks().setPool(DeckProxy.getAllSealedDecks(Singletons.getModel().getDecks().getSealed()));
-        view.getLstDecks().update();
+        view.getLstDecks().update(false, false, true);
 
         SwingUtilities.invokeLater(new Runnable() {
             @Override public void run() {
diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/DeckManager.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/DeckManager.java
index a5675069093..9621f58d9f4 100644
--- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/DeckManager.java
+++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/DeckManager.java
@@ -48,7 +48,7 @@ public final class DeckManager extends ItemManager<DeckProxy> {
     private static final FSkin.SkinIcon icoEditOver = FSkin.getIcon(FSkin.InterfaceIcons.ICO_EDIT_OVER);
 
     private final GameType gametype;
-    private boolean stringOnly, preventEdit;
+    private boolean stringOnly, preventEdit, hideFolderColumn;
     private UiCommand cmdDelete, cmdSelect;
     private final Map<ColumnDef, ItemColumn> columns = SColumnUtil.getColumns(
             ColumnDef.DECK_FAVORITE,
@@ -97,23 +97,31 @@ public final class DeckManager extends ItemManager<DeckProxy> {
      * Update table columns
      */
     public void update() {
-        update(false, false);
+        update(false, false, false);
     }
     public void update(boolean stringOnly0) {
-        update(stringOnly0, stringOnly0);
+        update(stringOnly0, stringOnly0, stringOnly0);
     }
     public void update(boolean stringOnly0, boolean preventEdit0) {
+        update(stringOnly0, preventEdit0, stringOnly0);
+    }
+    public void update(boolean stringOnly0, boolean preventEdit0, boolean hideFolderColumn0) {
         if (this.stringOnly != stringOnly0) {
             this.stringOnly = stringOnly0;
             this.restoreDefaultFilters();
         }
         if (stringOnly0) {
-            preventEdit0 = true; //if name only, always prevent edit
+            preventEdit0 = true; //if name only, always prevent edit and hide folder column
+            hideFolderColumn0 = true;
         }
         if (this.preventEdit != preventEdit0) {
             this.preventEdit = preventEdit0;
             columns.get(ColumnDef.DECK_ACTIONS).setVisible(!preventEdit0);
         }
+        if (this.hideFolderColumn != hideFolderColumn0) {
+            this.hideFolderColumn = hideFolderColumn0;
+            columns.get(ColumnDef.DECK_FOLDER).setVisible(!hideFolderColumn0);
+        }
         if (stringOnly0) {
             this.setup(SColumnUtil.getStringColumn());
         }