diff --git a/libs/shared/lib/components/pills/Pill.tsx b/libs/shared/lib/components/pills/Pill.tsx
index aa653ca408a845258875618c4b66f256e191724d..aea0755762a58d04c981e421f225847ba3d17453 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 9299eac7f900c00c60d2d47e0f090c715d500cdd..858066c2483588c2419e7d54573899cccf488d8c 100644
--- a/libs/shared/lib/querybuilder/panel/QueryBuilder.tsx
+++ b/libs/shared/lib/querybuilder/panel/QueryBuilder.tsx
@@ -174,9 +174,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,
     });
@@ -187,8 +189,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,
           },