Possible workaround for glitchy escape behavior