Fix bug with grid stealing focus when it shouldn't be + updated unit test to reflect desired behaviour.