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 20a4d76c452..7003a4ee6d0 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() > 0 && table.getRowCount() >= table.getEditingRow()) {
+        if (table.getRowCount() > 0 && table.getRowCount() >= table.getEditingRow() && table.getEditingRow() >= 0) {
             int row = table.convertRowIndexToModel(table.getEditingRow());
             fireEditingStopped();
             ActionEvent event = new ActionEvent(table, ActionEvent.ACTION_PERFORMED, "" + row);