diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDragAndDropEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDragAndDropEffect.java
index af3490c..fb25305 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDragAndDropEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDragAndDropEffect.java
@@ -120,9 +120,7 @@
 	Point coordinates = new Point(x, y);
 	coordinates = table.toControl(coordinates);
 	int /*long*/ [] path = new int /*long*/ [1];
-	int clientX = coordinates.x - table.getBorderWidth ();
-	int clientY = coordinates.y - table.getHeaderHeight ();
-	OS.gtk_tree_view_get_path_at_pos (handle, clientX, clientY, path, null, null, null);
+	OS.gtk_tree_view_get_path_at_pos (handle, coordinates.x, coordinates.y, path, null, null, null);
 	int index = -1;
 	if (path[0] != 0) {
 		int /*long*/ indices = OS.gtk_tree_path_get_indices (path[0]);
@@ -138,7 +136,7 @@
 	} else {
 		if (index != -1 && scrollIndex == index && scrollBeginTime != 0) {
 			if (System.currentTimeMillis() >= scrollBeginTime) {
-				if (clientY < table.getItemHeight()) {
+				if (coordinates.y < table.getItemHeight()) {
 					OS.gtk_tree_path_prev(path[0]);
 				} else {
 					OS.gtk_tree_path_next(path[0]);
@@ -147,7 +145,7 @@
 					OS.gtk_tree_view_scroll_to_cell(handle, path[0], 0, false, 0, 0);
 					OS.gtk_tree_path_free(path[0]);
 					path[0] = 0;
-					OS.gtk_tree_view_get_path_at_pos (handle, clientX, clientY, path, null, null, null);
+					OS.gtk_tree_view_get_path_at_pos (handle, coordinates.x, coordinates.y, path, null, null, null);
 				}
 				scrollBeginTime = 0;
 				scrollIndex = -1;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragAndDropEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragAndDropEffect.java
index 2653be4..d801352 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragAndDropEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragAndDropEffect.java
@@ -125,9 +125,7 @@
 	Point coordinates = new Point(x, y);
 	coordinates = tree.toControl(coordinates);
 	int /*long*/ [] path = new int /*long*/ [1];
-	int clientX = coordinates.x - tree.getBorderWidth ();
-	int clientY = coordinates.y - tree.getHeaderHeight ();
-	OS.gtk_tree_view_get_path_at_pos (handle, clientX, clientY, path, null, null, null);
+	OS.gtk_tree_view_get_path_at_pos (handle, coordinates.x, coordinates.y, path, null, null, null);
 	int index = -1;
 	if (path[0] != 0) {
 		int /*long*/ indices = OS.gtk_tree_path_get_indices(path[0]);
@@ -152,13 +150,13 @@
 					OS.gtk_tree_view_scroll_to_point (handle, -1, ty[0]);
 				} else {
 					//scroll down
-					OS.gtk_tree_view_get_path_at_pos (handle, clientX, clientY + cellRect.height, path, null, null, null);
+					OS.gtk_tree_view_get_path_at_pos (handle, coordinates.x, coordinates.y + cellRect.height, path, null, null, null);
 					if (path[0] != 0) {
 						OS.gtk_tree_view_scroll_to_cell(handle, path[0], 0, false, 0, 0);
 						OS.gtk_tree_path_free(path[0]);
 						path[0] = 0;
 					}
-					OS.gtk_tree_view_get_path_at_pos (handle, clientX, clientY, path, null, null, null);	
+					OS.gtk_tree_view_get_path_at_pos (handle, coordinates.x, coordinates.y, path, null, null, null);	
 				}
 				scrollBeginTime = 0;
 				scrollIndex = -1;