Fix GUI breaking during restarts (fixes #577)
Merge pull request #603 from AudriusButkevicius/restart

Fix GUI breaking during restarts (fixes #577)