diff --git a/forge-gui/src/main/java/forge/gui/home/sanctioned/AvatarSelector.java b/forge-gui/src/main/java/forge/gui/home/sanctioned/AvatarSelector.java
index 04471a5056b..ab5b9e33a8a 100644
--- a/forge-gui/src/main/java/forge/gui/home/sanctioned/AvatarSelector.java
+++ b/forge-gui/src/main/java/forge/gui/home/sanctioned/AvatarSelector.java
@@ -22,12 +22,9 @@ public class AvatarSelector extends FDialog {
     private List<FLabel> selectables = new ArrayList<FLabel>();
 	private final Map<Integer, SkinImage> avatarMap = FSkin.getAvatars();
 
-    public final void show(final AvatarSelector aSelector) {
-    	aSelector.setVisible(true);
-    	aSelector.dispose();
-    }
+    public AvatarSelector(final String playerName, final int currentIndex, final Collection<Integer> usedIndices) {
+        this.setTitle("Select avatar for " + playerName);
 
-    public AvatarSelector(final int currentIndex, final Collection<Integer> usedIndices) {
         final JPanel pnlAvatarPics = new JPanel(new WrapLayout());
 
         pnlAvatarPics.setOpaque(false);
diff --git a/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java b/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java
index a198eeb7c70..55a3cf10983 100644
--- a/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java
+++ b/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java
@@ -691,19 +691,21 @@ public enum VSubmenuConstructed implements IVSubmenu<CSubmenuConstructed> {
 			final int playerIndex = avatarList.indexOf(avatar);
 
 			changePlayerFocus(playerIndex);
+            avatar.requestFocusInWindow();
 
-			final AvatarSelector aSel = new AvatarSelector(usedAvatars.get(playerIndex), usedAvatars.values());
+			final AvatarSelector aSel = new AvatarSelector(getPlayerName(playerIndex), usedAvatars.get(playerIndex), usedAvatars.values());
 			for (final FLabel lbl : aSel.getSelectables()) {
 				lbl.setCommand(new Command() {
 					@Override
 		            public void run() {
 		                VSubmenuConstructed.this.setAvatar(avatar, playerIndex, Integer.valueOf(lbl.getName().substring(11)));
 		                aSel.setVisible(false);
-		                avatar.requestFocusInWindow();
 		            }
 				});
 			}
-			aSel.show(aSel);
+
+			aSel.setVisible(true);
+	        aSel.dispose();
 
 			if (playerIndex < 2) { updateAvatarPrefs(); }
 		}
@@ -713,9 +715,9 @@ public enum VSubmenuConstructed implements IVSubmenu<CSubmenuConstructed> {
             int playerIndex = avatarList.indexOf(avatar);
 
             changePlayerFocus(playerIndex);
+            avatar.requestFocusInWindow();
 
             setRandomAvatar(avatar, playerIndex);
-            avatar.requestFocusInWindow();
 
             if (playerIndex < 2) { updateAvatarPrefs(); }
         }