Merge branch 'RSherman_LEX' (minor UI display bug)

Fixes minor bug where cancel button on popup is showing at wrong times.