diff --git a/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java b/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java
index f15c6e01db0..08c43c5e05f 100644
--- a/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java
+++ b/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java
@@ -131,9 +131,10 @@ public class FDeckChooser extends JPanel implements IDecksComboBoxListener {
     }
 
     private void updateCustom() {
-        if(lstDecks.getGameType().getDeckFormat().equals(DeckFormat.Commander)){
+        DeckFormat deckFormat = lstDecks.getGameType().getDeckFormat();
+        if(deckFormat.equals(DeckFormat.Commander)){
             updateDecks(DeckProxy.getAllCommanderDecks(), ItemManagerConfig.COMMANDER_DECKS);
-        }else if(lstDecks.getGameType().getDeckFormat().equals(DeckFormat.TinyLeaders)){
+        }else if(deckFormat.equals(DeckFormat.TinyLeaders)){
             updateDecks(DeckProxy.getAllTinyLeadersDecks(), ItemManagerConfig.COMMANDER_DECKS);
         }else {
             updateDecks(DeckProxy.getAllConstructedDecks(), ItemManagerConfig.CONSTRUCTED_DECKS);