Fix issues with loading screens

Fixes #1095
Merge pull request #1096 from JabbR/splash-screen-fails-closing

Fix for Splash screen fails closing