Fix a deadlock/freeze (seen on Mac OS) when starting up with multiple windows open. Fix an issue where the active window loses focus when starting up.
DisposaBoy/