Fixed issue with select screen event coming much later than when screen is actually selected.