Move relocate mouse focus

Targets #421 
I think this should be removed before merging.