diff --git a/libs/shared/lib/components/pills/Pill.tsx b/libs/shared/lib/components/pills/Pill.tsx
index 8024b24a6500192bdcb20c5494f2472227283438..115a2b0f30bac3d784b2796c81941e2054e50c41 100644
--- a/libs/shared/lib/components/pills/Pill.tsx
+++ b/libs/shared/lib/components/pills/Pill.tsx
@@ -62,7 +62,12 @@ export const Pill = React.memo((props: PillI) => {
     dragImage.style.transform = 'translate(0, 0)';  // Removes the background from drag image in Chrome
     document.body.appendChild(dragImage);
 
-    event.dataTransfer.setDragImage(dragImage, pillWidth / 2, pillHeight / 2);
+    const mouse_x = event.clientX - pill.getBoundingClientRect().left;
+    const mouse_y = event.clientY - pill.getBoundingClientRect().top;
+
+    event.dataTransfer.setDragImage(dragImage, mouse_x, mouse_y);
+    event.dataTransfer.setData('mouse_x', String(mouse_x))
+    event.dataTransfer.setData('mouse_y', String(mouse_y))
     
     setTimeout(() => {
       dragImage.remove();
diff --git a/libs/shared/lib/querybuilder/panel/QueryBuilder.tsx b/libs/shared/lib/querybuilder/panel/QueryBuilder.tsx
index 11a453909f1b2e6c509da3231baf04bd3e20e5f3..51a51acd804e2ffc841b138226bfad6a86831962 100644
--- a/libs/shared/lib/querybuilder/panel/QueryBuilder.tsx
+++ b/libs/shared/lib/querybuilder/panel/QueryBuilder.tsx
@@ -172,9 +172,11 @@ export const QueryBuilderInner = (props: QueryBuilderProps) => {
     const data: string = event.dataTransfer.getData('application/reactflow');
     if (data.length == 0 || !reactFlow) return;
 
+    const mouse_x = parseFloat(event.dataTransfer.getData('mouse_x'));
+    const mouse_y = parseFloat(event.dataTransfer.getData('mouse_y'));
+
     const dragData = JSON.parse(data);
     const position = reactFlow.screenToFlowPosition({
-      //TODO: this position should be centre of entity, rather than topleft
       x: event.clientX,
       y: event.clientY,
     });
@@ -185,8 +187,8 @@ export const QueryBuilderInner = (props: QueryBuilderProps) => {
         graphologyGraph.addPill2Graphology(
           {
             type: QueryElementTypes.Entity,
-            x: position.x - (150 / 2),
-            y: position.y  - (24 / 2),
+            x: position.x - mouse_x,
+            y: position.y - mouse_y,
             name: dragData.name,
             schemaKey: dragData.name,
           },