Fix underlay drag issue reported by Martin Perrie