Fix drag / drop positioning on shape shift