EPD-191: Fix issue with dragging