Redid it to make it safer..

Just in case you close the app before showing the windows.