diff --git a/src/org/violetlib/vaquaclient/JTableWithMargins.java b/src/org/violetlib/vaquaclient/JTableWithMargins.java
index ffe3f12..8149406 100644
--- a/src/org/violetlib/vaquaclient/JTableWithMargins.java
+++ b/src/org/violetlib/vaquaclient/JTableWithMargins.java
@@ -223,12 +223,21 @@ public void sizeColumnsToFit(int resizingColumn)
     @Override
     public int columnAtPoint(@NotNull Point point)
     {
-        if (margin > 0) {
-            point = new Point(point.x - margin, point.y);
+        if (margin > 0 || verticalMargin > 0) {
+            point = new Point(point.x - margin, point.y - verticalMargin);
         }
         return super.columnAtPoint(point);
     }
 
+    @Override
+    public int rowAtPoint(@NotNull Point point)
+    {
+        if (margin > 0 || verticalMargin > 0) {
+            point = new Point(point.x - margin, point.y - verticalMargin);
+        }
+        return super.rowAtPoint(point);
+    }
+
     @Override
     public @NotNull Rectangle getCellRect(int row, int column, boolean includeSpacing)
     {