When exit grid to windows, use the correct window !
Merge branch 'develop'