Refocus on map after a control is interacted with

Fixes #2148