diff --git a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java
index d28badf2f79..59c4d888053 100644
--- a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java
+++ b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java
@@ -326,7 +326,7 @@ public class TablesPanel extends javax.swing.JPanel {
         table.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseClicked(MouseEvent e) {
-                int row = table.rowAtPoint(e.getPoint());
+                int row = table.convertRowIndexToModel(table.getSelectedRow());
                 if (e.getClickCount() == 2 && row != -1) {
                     action.actionPerformed(new ActionEvent(e.getSource(), e.getID(), "" + row));
                 }