diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/CLobby.java b/forge-gui-desktop/src/main/java/forge/screens/home/CLobby.java
index 0058e27744f..1c20478ef49 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/CLobby.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/CLobby.java
@@ -11,9 +11,7 @@ import com.google.common.collect.Iterables;
 
 import forge.deck.DeckProxy;
 import forge.deck.DeckType;
-import forge.deckchooser.DecksComboBoxEvent;
 import forge.deckchooser.FDeckChooser;
-import forge.deckchooser.IDecksComboBoxListener;
 import forge.model.FModel;
 import forge.properties.ForgePreferences;
 import forge.properties.ForgePreferences.FPref;
@@ -80,35 +78,15 @@ public class CLobby {
             final FDeckChooser fdccom = view.getCommanderDeckChooser(iSlot);
             fdccom.initialize(FPref.COMMANDER_DECK_STATES[iSlot], defaultDeckTypeForCommanderSlot(iSlot));
             fdccom.populate();
-            fdccom.getDecksComboBox().addListener(new IDecksComboBoxListener() {
-                @Override public final void deckTypeSelected(final DecksComboBoxEvent ev) {
-                    view.focusOnAvatar();
-                }
-            });
             final FDeckChooser fdobcom = view.getOathbreakerDeckChooser(iSlot);
             fdobcom.initialize(FPref.OATHBREAKER_DECK_STATES[iSlot], defaultDeckTypeForOathbreakerSlot(iSlot));
             fdobcom.populate();
-            fdobcom.getDecksComboBox().addListener(new IDecksComboBoxListener() {
-                @Override public final void deckTypeSelected(final DecksComboBoxEvent ev) {
-                    view.focusOnAvatar();
-                }
-            });
             final FDeckChooser fdtlcom = view.getTinyLeaderDeckChooser(iSlot);
             fdtlcom.initialize(FPref.TINY_LEADER_DECK_STATES[iSlot], defaultDeckTypeForTinyLeaderSlot(iSlot));
             fdtlcom.populate();
-            fdtlcom.getDecksComboBox().addListener(new IDecksComboBoxListener() {
-                @Override public final void deckTypeSelected(final DecksComboBoxEvent ev) {
-                    view.focusOnAvatar();
-                }
-            });
             final FDeckChooser fdbcom = view.getBrawlDeckChooser(iSlot);
             fdbcom.initialize(FPref.BRAWL_DECK_STATES[iSlot], defaultDeckTypeForBrawlSlot(iSlot));
             fdbcom.populate();
-            fdbcom.getDecksComboBox().addListener(new IDecksComboBoxListener() {
-                @Override public final void deckTypeSelected(final DecksComboBoxEvent ev) {
-                    view.focusOnAvatar();
-                }
-            });
         }
 
         final ForgePreferences prefs = FModel.getPreferences();
diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuConstructed.java b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuConstructed.java
index 6ca945c0a28..e8ac7260787 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuConstructed.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuConstructed.java
@@ -3,9 +3,7 @@ package forge.screens.home.sanctioned;
 import javax.swing.JPanel;
 
 import net.miginfocom.swing.MigLayout;
-import forge.deckchooser.DecksComboBoxEvent;
 import forge.deckchooser.FDeckChooser;
-import forge.deckchooser.IDecksComboBoxListener;
 import forge.gui.framework.DragCell;
 import forge.gui.framework.DragTab;
 import forge.gui.framework.EDocID;
@@ -131,11 +129,6 @@ public enum VSubmenuConstructed implements IVSubmenu<CSubmenuConstructed> {
 
         for (final FDeckChooser fdc : vLobby.getDeckChoosers()) {
             fdc.populate();
-            fdc.getDecksComboBox().addListener(new IDecksComboBoxListener() {
-                @Override public final void deckTypeSelected(final DecksComboBoxEvent ev) {
-                    vLobby.focusOnAvatar();
-                }
-            });
         }
 
         container.add(vLobby.getConstructedFrame(), "gap 20px 20px 20px 0px, push, grow");