Better handling of the return to the initial GUI screen.
This was broken on MS Windows.
Authored by: bugman 2011-06-15
Parent: [r13059]
Child: [r13061]
