We are running a slightly different code path, make sure that we still honour conventions like screen focus. BUG: 427882
mentioned in commit a8a4c9a8