diff --git a/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java b/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java
index dda1e6a5be9..14659169f15 100644
--- a/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java
@@ -226,7 +226,7 @@ public class BattlefieldPanel extends javax.swing.JLayeredPane {
     }
 
     public void sortLayout() {
-        if (battlefield == null) {
+        if (battlefield == null || this.getWidth() < 1) { // Can't do layout when panel is not sized yet
             return;
         }
 
diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
index 38d6a5ea8cd..ed5c9b7ba22 100644
--- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
@@ -608,9 +608,9 @@ public final class GamePanel extends javax.swing.JPanel {
             }
         }
         PlayerView player = game.getPlayers().get(playerSeat);
-        PlayAreaPanel sessionPlayer = new PlayAreaPanel(player, bigCard, gameId, game.getPriorityTime(), this,
-                new PlayAreaPanelOptions(game.isPlayer(), true, game.isRollbackTurnsAllowed()));
-        players.put(player.getPlayerId(), sessionPlayer);
+        PlayAreaPanel playAreaPanel = new PlayAreaPanel(player, bigCard, gameId, game.getPriorityTime(), this,
+                new PlayAreaPanelOptions(game.isPlayer(), game.isPlayer(), game.isRollbackTurnsAllowed()));
+        players.put(player.getPlayerId(), playAreaPanel);
         GridBagConstraints c = new GridBagConstraints();
         c.fill = GridBagConstraints.BOTH;
         c.weightx = 0.5;
@@ -620,8 +620,8 @@ public final class GamePanel extends javax.swing.JPanel {
         }
         c.gridx = col;
         c.gridy = row;
-        this.pnlBattlefield.add(sessionPlayer, c);
-        sessionPlayer.setVisible(true);
+        this.pnlBattlefield.add(playAreaPanel, c);
+        playAreaPanel.setVisible(true);
         if (oddNumber) {
             col++;
         }
diff --git a/Mage.Client/src/main/java/mage/client/util/ButtonColumn.java b/Mage.Client/src/main/java/mage/client/util/ButtonColumn.java
index 7815d8bfdcb..20a4d76c452 100644
--- a/Mage.Client/src/main/java/mage/client/util/ButtonColumn.java
+++ b/Mage.Client/src/main/java/mage/client/util/ButtonColumn.java
@@ -111,7 +111,7 @@ public class ButtonColumn extends AbstractCellEditor implements TableCellRendere
 
     @Override
     public void actionPerformed(ActionEvent e) {
-        if (table.getRowCount() >= table.getEditingRow()) {
+        if (table.getRowCount() > 0 && table.getRowCount() >= table.getEditingRow()) {
             int row = table.convertRowIndexToModel(table.getEditingRow());
             fireEditingStopped();
             ActionEvent event = new ActionEvent(table, ActionEvent.ACTION_PERFORMED, "" + row);